Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2014-09-20 07:07:18 +00:00 committed by Gerrit Code Review
commit 5ff4cbfe60
4 changed files with 10 additions and 10 deletions

@ -2,9 +2,9 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
oslo.config>=1.4.0.0a3 oslo.config>=1.4.0 # Apache-2.0
oslo.utils>=0.3.0 # Apache-2.0 oslo.utils>=1.0.0 # Apache-2.0
stevedore>=0.14 stevedore>=1.0.0 # Apache-2.0
# for jsonutils # for jsonutils
six>=1.7.0 six>=1.7.0

@ -2,9 +2,9 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
oslo.config>=1.4.0.0a3 oslo.config>=1.4.0 # Apache-2.0
oslo.utils>=0.3.0 # Apache-2.0 oslo.utils>=1.0.0 # Apache-2.0
stevedore>=0.14 stevedore>=1.0.0 # Apache-2.0
# for jsonutils # for jsonutils
six>=1.7.0 six>=1.7.0

@ -13,7 +13,7 @@ python-subunit>=0.0.18
testrepository>=0.0.18 testrepository>=0.0.18
testscenarios>=0.4 testscenarios>=0.4
testtools>=0.9.34 testtools>=0.9.34
oslotest>=1.1.0.0a2 oslotest>=1.1.0 # Apache-2.0
# when we can require tox>= 1.4, this can go into tox.ini: # when we can require tox>= 1.4, this can go into tox.ini:
# [testenv:cover] # [testenv:cover]
@ -22,4 +22,4 @@ coverage>=3.6
# this is required for the docs build jobs # this is required for the docs build jobs
sphinx>=1.1.2,!=1.2.0,<1.3 sphinx>=1.1.2,!=1.2.0,<1.3
oslosphinx>=2.2.0.0a2 oslosphinx>=2.2.0 # Apache-2.0

@ -13,7 +13,7 @@ python-subunit>=0.0.18
testrepository>=0.0.18 testrepository>=0.0.18
testscenarios>=0.4 testscenarios>=0.4
testtools>=0.9.34 testtools>=0.9.34
oslotest>=1.1.0.0a2 oslotest>=1.1.0 # Apache-2.0
# for test_qpid # for test_qpid
qpid-python qpid-python
@ -25,4 +25,4 @@ coverage>=3.6
# this is required for the docs build jobs # this is required for the docs build jobs
sphinx>=1.1.2,!=1.2.0,<1.3 sphinx>=1.1.2,!=1.2.0,<1.3
oslosphinx>=2.2.0.0a2 oslosphinx>=2.2.0 # Apache-2.0