Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2016-06-02 00:57:23 +00:00 committed by Gerrit Code Review
commit 574eef5a30
2 changed files with 3 additions and 3 deletions

@ -6,7 +6,7 @@ keystoneauth1>=2.1.0 # Apache-2.0
iso8601>=0.1.11 # MIT
oslo.i18n>=2.1.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
oslo.utils>=3.5.0 # Apache-2.0
oslo.utils>=3.11.0 # Apache-2.0
PrettyTable<0.8,>=0.7 # BSD
requests>=2.10.0 # Apache-2.0
simplejson>=2.2.0 # MIT

@ -8,9 +8,9 @@ coverage>=3.6 # Apache-2.0
discover # BSD
fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
keyring>=5.5.1 # MIT/PSF
mock>=1.2 # BSD
mock>=2.0 # BSD
python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0
python-cinderclient!=1.7.0,>=1.6.0 # Apache-2.0
python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0
requests-mock>=0.7.0 # Apache-2.0
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
os-client-config>=1.13.1 # Apache-2.0