Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2016-02-26 05:02:41 +00:00 committed by Gerrit Code Review
commit 7cfcea71fb
1 changed files with 2 additions and 2 deletions

View File

@ -13,7 +13,7 @@ keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0
lxml>=2.3 # BSD
netaddr!=0.7.16,>=0.7.12 # BSD
oslo.cache>=0.8.0 # Apache-2.0
oslo.config>=3.4.0 # Apache-2.0
oslo.config>=3.7.0 # Apache-2.0
oslo.concurrency>=3.5.0 # Apache-2.0
oslo.context>=0.2.0 # Apache-2.0
oslo.db>=4.1.0 # Apache-2.0
@ -51,7 +51,7 @@ python-zaqarclient>=0.3.0 # Apache-2.0
pytz>=2013.6 # MIT
PyYAML>=3.1.0 # MIT
requests!=2.9.0,>=2.8.1 # Apache-2.0
retrying>=1.2.3,!=1.3.0 # Apache-2.0
retrying!=1.3.0,>=1.2.3 # Apache-2.0
Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7' # MIT
Routes!=2.0,>=1.12.3;python_version!='2.7' # MIT
six>=1.9.0 # MIT