summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-07-23 04:38:58 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-07-23 04:38:58 +0000
commit1cf3c13717ae1b7bb95cbe5da5c194f09c705e90 (patch)
treed2870997c65113bfa06aa56147d3f3050ed7ac14
parent57c3065eb8123ca9c9dc50c98c6d8fbb45920e3d (diff)
downloadironic-1cf3c13717ae1b7bb95cbe5da5c194f09c705e90.tar.gz
Updated from global requirements
Change-Id: I853c6b45b8936dcaaefbe949ea30d9eb7b6c2940
-rw-r--r--requirements.txt2
-rw-r--r--test-requirements.txt3
2 files changed, 2 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt
index 90eb4932a..52164822c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -37,7 +37,7 @@ jsonpatch>=1.1
WSME>=0.7
Jinja2>=2.6 # BSD License (3 clause)
keystonemiddleware>=2.0.0
-oslo.messaging>=1.16.0 # Apache-2.0
+oslo.messaging!=1.17.0,!=1.17.1,>=1.16.0 # Apache-2.0
retrying!=1.3.0,>=1.2.3 # Apache-2.0
posix-ipc
oslo.versionedobjects!=0.5.0,>=0.3.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 9120ab6b7..054e12277 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,8 +5,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
Babel>=1.3
PyMySQL>=0.6.2 # MIT License
oslotest>=1.7.0 # Apache-2.0