Merge "Use global openstack requirements"

This commit is contained in:
Jenkins 2013-09-12 15:37:40 +00:00 committed by Gerrit Code Review
commit e3411c1e37
2 changed files with 7 additions and 7 deletions

View File

@ -3,7 +3,7 @@ WebOb>=1.2.3,<1.3
kombu>=2.4.8 kombu>=2.4.8
iso8601>=0.1.4 iso8601>=0.1.4
argparse argparse
SQLAlchemy>=0.7.8,<=0.7.99 SQLAlchemy>=0.7.8,<0.8
sqlalchemy-migrate>=0.7.2 sqlalchemy-migrate>=0.7.2
alembic>=0.4.1 alembic>=0.4.1
netaddr netaddr
@ -16,9 +16,9 @@ stevedore>=0.10
msgpack-python msgpack-python
python-glanceclient>=0.9.0 python-glanceclient>=0.9.0
python-novaclient>=2.12.0 python-novaclient>=2.12.0
python-keystoneclient>=0.3.0 python-keystoneclient>=0.3.2
python-ceilometerclient>=1.0.2 python-ceilometerclient>=1.0.3
python-swiftclient>=1.2 python-swiftclient>=1.5
lxml>=2.3 lxml>=2.3
requests>=1.1 requests>=1.1
six<1.4.0 six<1.4.0

View File

@ -1,5 +1,5 @@
pep8==1.4.5 pep8==1.4.5
pyflakes==0.7.2 pyflakes>=0.7.2,<0.7.4
flake8==2.0 flake8==2.0
hacking>=0.5.6,<0.8 hacking>=0.5.6,<0.8
coverage>=3.6 coverage>=3.6
@ -7,7 +7,7 @@ discover
httplib2 httplib2
mock>=1.0 mock>=1.0
mox>=0.5.3 mox>=0.5.3
fixtures>=0.3.12 fixtures>=0.3.14
Babel>=0.9.6 Babel>=0.9.6
http://tarballs.openstack.org/nova/nova-master.tar.gz#egg=nova http://tarballs.openstack.org/nova/nova-master.tar.gz#egg=nova
swift swift
@ -19,4 +19,4 @@ oslo.sphinx
python-subunit python-subunit
testrepository>=0.0.17 testrepository>=0.0.17
testtools>=0.9.32 testtools>=0.9.32
testscenarios>=0.4,<0.5 testscenarios>=0.4