summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-07-23 12:52:36 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-07-23 12:52:36 +0000
commit258073e5b3c65ca20ddf454ebaf124a3b64a9354 (patch)
tree0843a19632a335a4444f032184ea558f72774f2c
parent0142fc20f14563ff871733955424a5e9a61b2e4d (diff)
downloadnova-258073e5b3c65ca20ddf454ebaf124a3b64a9354.tar.gz
Updated from global requirements
Change-Id: I3c565df2d133003b69d9be08cefb8c0888c380ea
-rw-r--r--requirements.txt4
-rw-r--r--test-requirements.txt5
2 files changed, 4 insertions, 5 deletions
diff --git a/requirements.txt b/requirements.txt
index 86f45b7626..47c9968a38 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -25,7 +25,7 @@ pyasn1
Babel>=1.3
iso8601>=0.1.9
jsonschema!=2.5.0,<3.0.0,>=2.0.0
-python-cinderclient>=1.2.2
+python-cinderclient>=1.3.1
python-keystoneclient>=1.6.0
python-neutronclient<3,>=2.3.11
python-glanceclient>=0.18.0
@@ -42,7 +42,7 @@ oslo.serialization>=1.4.0 # Apache-2.0
oslo.utils>=1.9.0 # Apache-2.0
oslo.db>=1.12.0 # Apache-2.0
oslo.rootwrap>=2.0.0 # Apache-2.0
-oslo.messaging>=1.16.0 # Apache-2.0
+oslo.messaging!=1.17.0,!=1.17.1,>=1.16.0 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0
oslo.service>=0.1.0 # Apache-2.0
rfc3986>=0.2.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 79826da82b..eca1ccb022 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,8 +6,7 @@ hacking<0.11,>=0.10.0
coverage>=3.6
discover
fixtures>=1.3.1
-mock!=1.1.4,>=1.1;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
mox3>=0.7.0
psycopg2
PyMySQL>=0.6.2 # MIT License
@@ -25,4 +24,4 @@ tempest-lib>=0.6.1
bandit>=0.10.1
# vmwareapi driver specific dependencies
-oslo.vmware>=0.13.1 # Apache-2.0
+oslo.vmware>=1.16.0 # Apache-2.0