Updated from global requirements

Change-Id: I4fad1a2e80e068ea9536af18931378c56826437b
2015-07-23 04:42:13 +00:00 · 2015-07-23 04:42:13 +00:00 · 50914091ec
commit 50914091ec
parent c6e6a55fef
2 changed files with 2 additions and 3 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -6,7 +6,7 @@ Babel>=1.3
 oslo.concurrency>=2.1.0 # Apache-2.0
 oslo.config>=1.11.0 # Apache-2.0
 oslo.context>=0.2.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.serialization>=1.4.0 # Apache-2.0
 oslo.utils>=1.9.0 # Apache-2.0
 iso8601>=0.1.9
--- a/setup.cfg
+++ b/setup.cfg
@ -24,8 +24,7 @@ packages =

 [extras]
 fixtures =
-  mock!=1.1.4,>=1.1:python_version!='2.6'
-  mock==1.0.1:python_version=='2.6'
+  mock>=1.2
  fixtures>=1.3.1

 [pbr]