Merge "Updated from global requirements"

This commit is contained in:
Jenkins
2015-12-28 04:54:30 +00:00
committed by Gerrit Code Review
2 changed files with 3 additions and 3 deletions

View File

@@ -5,8 +5,8 @@ pbr>=1.6
argparse argparse
PrettyTable<0.8,>=0.7 PrettyTable<0.8,>=0.7
python-keystoneclient!=1.8.0,>=1.6.0 python-keystoneclient!=1.8.0,>=1.6.0
requests>=2.8.1 requests!=2.9.0,>=2.8.1
simplejson>=2.2.0 simplejson>=2.2.0
Babel>=1.3 Babel>=1.3
six>=1.9.0 six>=1.9.0
oslo.utils!=3.1.0,>=2.8.0 # Apache-2.0 oslo.utils>=3.2.0 # Apache-2.0

View File

@@ -12,6 +12,6 @@ python-subunit>=0.0.18
reno>=0.1.1 # Apache2 reno>=0.1.1 # Apache2
requests-mock>=0.7.0 # Apache-2.0 requests-mock>=0.7.0 # Apache-2.0
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
tempest-lib>=0.11.0 tempest-lib>=0.12.0
testtools>=1.4.0 testtools>=1.4.0
testrepository>=0.0.18 testrepository>=0.0.18