Merge "Updated from global requirements" into stable/kilo

Jenkins · openstack-gerrit · commit bee11edd327c · 2015-04-16T04:44:42.000Z
diff --git a/requirements.txt b/requirements.txt
@@ -5,16 +5,16 @@ pbr>=0.6,!=0.7,<1.0
 six>=1.9.0
 
 Babel>=1.3
-cliff>=1.7.0  # Apache-2.0
+cliff>=1.10.0,<1.11.0  # Apache-2.0
 cliff-tablib>=1.0
-oslo.config>=1.9.0  # Apache-2.0
-oslo.i18n>=1.3.0  # Apache-2.0
-oslo.utils>=1.2.0                       # Apache-2.0
-oslo.serialization>=1.2.0               # Apache-2.0
+oslo.config>=1.9.3,<1.10.0  # Apache-2.0
+oslo.i18n>=1.5.0,<1.6.0  # Apache-2.0
+oslo.utils>=1.4.0,<1.5.0                       # Apache-2.0
+oslo.serialization>=1.4.0,<1.5.0               # Apache-2.0
 python-glanceclient>=0.15.0
 python-keystoneclient>=1.1.0
-python-novaclient>=2.18.0,!=2.21.0
+python-novaclient>=2.22.0
 python-cinderclient>=1.1.0
 python-neutronclient>=2.3.11,<3
 requests>=2.2.0,!=2.4.0
-stevedore>=1.1.0  # Apache-2.0
+stevedore>=1.3.0,<1.4.0  # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -7,9 +7,9 @@ coverage>=3.6
 discover
 fixtures>=0.3.14
 mock>=1.0
-oslosphinx>=2.2.0  # Apache-2.0
-oslotest>=1.2.0  # Apache-2.0
-requests-mock>=0.5.1  # Apache-2.0
+oslosphinx>=2.5.0,<2.6.0  # Apache-2.0
+oslotest>=1.5.1,<1.6.0  # Apache-2.0
+requests-mock>=0.6.0  # Apache-2.0
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 testrepository>=0.0.18
 testtools>=0.9.36,!=1.2.0
