Merge "Updated from global requirements"

This commit is contained in:
Jenkins
2015-03-23 05:22:38 +00:00
committed by Gerrit Code Review
2 changed files with 7 additions and 7 deletions

View File

@@ -6,7 +6,7 @@ argparse
requests>=2.2.0,!=2.4.0
six>=1.9.0
python-keystoneclient>=1.1.0
cliff>=1.7.0 # Apache-2.0
oslo.i18n>=1.3.0 # Apache-2.0
oslo.serialization>=1.2.0 # Apache-2.0
oslo.utils>=1.2.0 # Apache-2.0
cliff>=1.10.0,<1.11.0 # Apache-2.0
oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0
oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0
oslo.utils>=1.4.0,<1.5.0 # Apache-2.0

View File

@@ -5,13 +5,13 @@ coverage>=3.6
discover
hacking>=0.7.0
fixtures>=0.3.14
requests-mock>=0.5.1 # Apache-2.0
requests-mock>=0.6.0 # Apache-2.0
mock>=1.0
testrepository>=0.0.18
testtools>=0.9.36,!=1.2.0
oslotest>=1.2.0
oslotest>=1.5.1,<1.6.0 # Apache-2.0
nose
# Documentation build requirements
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
oslosphinx>=2.2.0 # Apache-2.0
oslosphinx>=2.5.0,<2.6.0 # Apache-2.0