Merge "Updated from global requirements"

This commit is contained in:
Jenkins
2015-12-04 05:08:49 +00:00
committed by Gerrit Code Review
2 changed files with 4 additions and 4 deletions

View File

@@ -4,9 +4,9 @@
pbr>=1.6
argparse
PrettyTable<0.8,>=0.7
requests!=2.8.0,>=2.5.2
requests>=2.8.1
simplejson>=2.2.0
oslo.utils!=2.6.0,>=2.4.0 # Apache-2.0
oslo.utils>=2.8.0 # Apache-2.0
python-keystoneclient!=1.8.0,>=1.6.0
Babel>=1.3
six>=1.9.0

View File

@@ -4,8 +4,8 @@
hacking<0.11,>=0.10.0
coverage>=3.6
discover
oslosphinx>=2.5.0 # Apache-2.0
requests-mock>=0.6.0 # Apache-2.0
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
requests-mock>=0.7.0 # Apache-2.0
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
testrepository>=0.0.18
testscenarios>=0.4