Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2016-05-31 18:13:15 +00:00 committed by Gerrit Code Review
commit 49c7f91327
2 changed files with 3 additions and 3 deletions

@ -8,7 +8,7 @@ futurist>=0.11.0 # Apache-2.0
oslo.config>=3.9.0 # Apache-2.0
oslo.context>=2.2.0 # Apache-2.0
oslo.log>=1.14.0 # Apache-2.0
oslo.utils>=3.5.0 # Apache-2.0
oslo.utils>=3.9.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
oslo.service>=1.10.0 # Apache-2.0
oslo.i18n>=2.1.0 # Apache-2.0
@ -33,7 +33,7 @@ PyYAML>=3.1.0 # MIT
# rabbit driver is the default
# we set the amqp version to ensure heartbeat works
amqp>=1.4.0 # LGPL
amqp<2.0,>=1.4.0 # LGPL
kombu>=3.0.25 # BSD
pika>=0.10.0 # BSD
pika-pool>=0.1.3 # BSD

@ -7,7 +7,7 @@ hacking<0.11,>=0.10.0
discover # BSD
fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
mock>=1.2 # BSD
mock>=2.0 # BSD
mox3>=0.7.0 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD
testrepository>=0.0.18 # Apache-2.0/BSD