Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2014-11-26 23:28:46 +00:00 committed by Gerrit Code Review
commit 1feafeec00
2 changed files with 3 additions and 3 deletions

View File

@ -15,8 +15,8 @@ iso8601>=0.1.9
kombu>=2.5.0 kombu>=2.5.0
lxml>=2.3 lxml>=2.3
oslo.config>=1.4.0 # Apache-2.0 oslo.config>=1.4.0 # Apache-2.0
oslo.db>=1.0.0 # Apache-2.0 oslo.db>=1.1.0 # Apache-2.0
pecan>=0.5.0 pecan>=0.8.0
posix_ipc posix_ipc
python-heatclient>=0.2.9 python-heatclient>=0.2.9
python-keystoneclient>=0.11.1 python-keystoneclient>=0.11.1

View File

@ -14,7 +14,7 @@ sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
sphinxcontrib-pecanwsme>=0.8 sphinxcontrib-pecanwsme>=0.8
stevedore>=1.1.0 # Apache-2.0 stevedore>=1.1.0 # Apache-2.0
testrepository>=0.0.18 testrepository>=0.0.18
testtools>=0.9.36 testtools>=0.9.36,!=1.2.0
unittest2 unittest2
psycopg2 psycopg2
MySQL-python MySQL-python