summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-01 02:00:50 +0000
committerGerrit Code Review <review@openstack.org>2015-04-01 02:00:50 +0000
commitd5f2c50c0f2de6d741f86113fc5260bdb7895102 (patch)
treefc9aa124813d4a4287a56e16c8200e3ec064ba02
parent8ec2fdce2687f26033b8b66d488d2a3ab6620cf1 (diff)
parentf6bd2fa394e2878586f67b38fa64609a86c5d6df (diff)
downloadpython-openstackclient-d5f2c50c0f2de6d741f86113fc5260bdb7895102.tar.gz
Merge "Updated from global requirements"
-rw-r--r--requirements.txt14
-rw-r--r--test-requirements.txt6
2 files changed, 10 insertions, 10 deletions
diff --git a/requirements.txt b/requirements.txt
index 97d06c48..2e18b0b8 100644
--- 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
index e897e601..cbbac96b 100644
--- 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