Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2014-09-20 07:11:51 +00:00 committed by Gerrit Code Review
commit 0ac0255ac4
2 changed files with 3 additions and 3 deletions

View File

@ -5,4 +5,4 @@
Babel>=1.3
six>=1.7.0
iso8601>=0.1.9
oslo.i18n>=0.3.0 # Apache-2.0
oslo.i18n>=1.0.0 # Apache-2.0

View File

@ -10,7 +10,7 @@ python-subunit>=0.0.18
testrepository>=0.0.18
testscenarios>=0.4
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:
# [testenv:cover]
@ -19,7 +19,7 @@ coverage>=3.6
# this is required for the docs build jobs
sphinx>=1.1.2,!=1.2.0,<1.3
oslosphinx>=2.2.0.0a2
oslosphinx>=2.2.0 # Apache-2.0
# mocking framework
mock>=1.0