Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2016-01-20 22:01:25 +00:00 committed by Gerrit Code Review
commit 47f223237f
2 changed files with 14 additions and 14 deletions

View File

@ -2,12 +2,12 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr>=1.6
Babel>=1.3
cryptography>=1.0 # Apache-2.0
oslo.config>=2.7.0 # Apache-2.0
pbr>=1.6 # Apache-2.0
Babel>=1.3 # BSD
cryptography>=1.0 # BSD/Apache-2.0
oslo.config>=3.2.0 # Apache-2.0
oslo.context>=0.2.0 # Apache-2.0
oslo.log>=1.12.0 # Apache-2.0
oslo.log>=1.14.0 # Apache-2.0
oslo.policy>=0.5.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
oslo.utils>=3.2.0 # Apache-2.0
oslo.utils>=3.4.0 # Apache-2.0

View File

@ -4,13 +4,13 @@
hacking<0.10,>=0.9.2
coverage>=3.6
discover
python-barbicanclient>=3.3.0
python-subunit>=0.0.18
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
coverage>=3.6 # Apache-2.0
discover # BSD
python-barbicanclient>=3.3.0 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
testrepository>=0.0.18
testscenarios>=0.4
testtools>=1.4.0
testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=1.4.0 # MIT