Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2014-10-20 15:40:41 +00:00 committed by Gerrit Code Review
commit f8e2e42835
2 changed files with 3 additions and 3 deletions

View File

@ -6,8 +6,8 @@ argparse
cliff>=1.7.0 # Apache-2.0
iso8601>=0.1.9
netaddr>=0.7.12
requests>=1.2.1,!=2.4.0
python-keystoneclient>=0.10.0
requests>=2.2.0,!=2.4.0
python-keystoneclient>=0.11.1
simplejson>=2.2.0
six>=1.7.0
Babel>=1.3

View File

@ -12,6 +12,6 @@ oslosphinx>=2.2.0 # Apache-2.0
oslotest>=1.1.0 # Apache-2.0
python-subunit>=0.0.18
requests-mock>=0.4.0 # Apache-2.0
sphinx>=1.1.2,!=1.2.0,<1.3
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
testrepository>=0.0.18
testtools>=0.9.34