Merge "Updated from global requirements" into stable/kilo

This commit is contained in:
Jenkins 2015-04-23 11:57:34 +00:00 committed by Gerrit Code Review
commit dee609cb79
2 changed files with 6 additions and 6 deletions

View File

@ -12,10 +12,10 @@ sqlalchemy-migrate>=0.9.5
netaddr>=0.7.12
paramiko>=1.13.0
iso8601>=0.1.9
python-neutronclient>=2.3.11,<3
python-glanceclient>=0.15.0
python-keystoneclient>=1.1.0
python-swiftclient>=2.2.0
python-neutronclient>=2.3.11,<2.5.0
python-glanceclient>=0.15.0,<0.18.0
python-keystoneclient>=1.1.0,<1.4.0
python-swiftclient>=2.2.0,<2.5.0
stevedore>=1.3.0,<1.4.0 # Apache-2.0
pysendfile==2.0.0
websockify>=0.6.0,<0.7
@ -34,7 +34,7 @@ six>=1.9.0
jsonpatch>=1.1
WSME>=0.6
Jinja2>=2.6 # BSD License (3 clause)
keystonemiddleware>=1.5.0
keystonemiddleware>=1.5.0,<1.6.0
oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0
retrying>=1.2.3,!=1.3.0 # Apache-2.0
posix_ipc

View File

@ -10,7 +10,7 @@ Babel>=1.3
MySQL-python
oslotest>=1.5.1,<1.6.0 # Apache-2.0
psycopg2
python-ironicclient>=0.2.1
python-ironicclient>=0.2.1,<0.6.0
python-subunit>=0.0.18
testrepository>=0.0.18
testtools>=0.9.36,!=1.2.0