Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2015-07-24 17:23:15 +00:00 committed by Gerrit Code Review
commit 9265eee5b3
2 changed files with 3 additions and 4 deletions

View File

@ -24,7 +24,7 @@ oslo.service>=0.1.0 # Apache-2.0
PasteDeploy>=1.5.0 PasteDeploy>=1.5.0
pbr<2.0,>=1.3 pbr<2.0,>=1.3
pecan>=0.8.0 pecan>=0.8.0
oslo.messaging>=1.16.0 # Apache-2.0 oslo.messaging!=1.17.0,!=1.17.1,>=1.16.0 # Apache-2.0
oslo.middleware>=2.4.0 # Apache-2.0 oslo.middleware>=2.4.0 # Apache-2.0
oslo.serialization>=1.4.0 # Apache-2.0 oslo.serialization>=1.4.0 # Apache-2.0
oslo.utils>=1.9.0 # Apache-2.0 oslo.utils>=1.9.0 # Apache-2.0

View File

@ -12,13 +12,12 @@ elasticsearch>=1.3.0
fixtures>=1.3.1 fixtures>=1.3.1
happybase!=0.7,>=0.5;python_version=='2.7' happybase!=0.7,>=0.5;python_version=='2.7'
httplib2>=0.7.5 httplib2>=0.7.5
mock!=1.1.4,>=1.1;python_version!='2.6' mock>=1.2
mock==1.0.1;python_version=='2.6'
PyMySQL>=0.6.2 # MIT License PyMySQL>=0.6.2 # MIT License
# Docs Requirements # Docs Requirements
oslosphinx>=2.5.0 # Apache-2.0 oslosphinx>=2.5.0 # Apache-2.0
oslotest>=1.7.0 # Apache-2.0 oslotest>=1.7.0 # Apache-2.0
oslo.vmware>=0.13.1 # Apache-2.0 oslo.vmware>=1.16.0 # Apache-2.0
psycopg2 psycopg2
pylint==1.4.4 # GNU GPL v2 pylint==1.4.4 # GNU GPL v2
pymongo>=3.0.2 pymongo>=3.0.2