commit 81c1bec75aeb2e2623b854d0d7664bf7a6a4a151
author Jenkins <jenkins@review.openstack.org> Sat Feb 07 12:44:43 2015 +0000
committer Gerrit Code Review <review@openstack.org> Sat Feb 07 12:44:43 2015 +0000
tree 882891e59edef3b8a67c8166ba1f5468dcd72c21
parent 962ce07856b99f1611f86e2fa7371f8bf40bece3
parent e0ff626423944ed3b1e08ddeebbfcf60885307a5

Merge "Fix stress test which was not changed to receive one client value"

requirements.txt

diff --git a/requirements.txt b/requirements.txt
index 1ce2fc5..94c6fb0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@
 httplib2>=0.7.5
 jsonschema>=2.0.0,<3.0.0
 testtools>=0.9.36,!=1.2.0
-boto>=2.32.1,<2.35.0
+boto>=2.32.1
 paramiko>=1.13.0
 netaddr>=0.7.12
 python-ceilometerclient>=1.0.6

tempest/cli/simple_read_only/compute/test_nova.py

diff --git a/tempest/cli/simple_read_only/compute/test_nova.py b/tempest/cli/simple_read_only/compute/test_nova.py
index 4fe4982..5efeb75 100644
--- a/tempest/cli/simple_read_only/compute/test_nova.py
+++ b/tempest/cli/simple_read_only/compute/test_nova.py
@@ -149,7 +149,7 @@
     def test_admin_secgroup_list_rules(self):
         self.nova('secgroup-list-rules')
 
-    @tempest.cli.min_client_version(client='nova', version='2.18')
+    @cli.min_client_version(client='nova', version='2.18')
     def test_admin_server_group_list(self):
         self.nova('server-group-list')