Merge "Updated from global requirements" into stable/juno

This commit is contained in:
Jenkins 2015-04-11 07:24:02 +00:00 committed by Gerrit Code Review
commit 7db2ae9ead
2 changed files with 5 additions and 5 deletions

View File

@ -22,7 +22,7 @@ python-cinderclient>=1.1.0,<=1.1.1
python-keystoneclient>=0.10.0,<=1.1.0
python-swiftclient>=2.2.0,<=2.3.1
python-designateclient>=1.0.0,<=1.1.1
python-neutronclient>=2.3.6,<3
python-neutronclient>=2.3.6,<2.4.0
iso8601>=0.1.9,<=0.1.10
jsonschema>=2.0.0,<3.0.0
Jinja2<=2.7.2

View File

@ -12,12 +12,12 @@ nosexcover
openstack-doc-tools>=0.18.1
openstack.nose_plugin>=0.7
WebTest>=2.0,<=2.0.18
wsgi_intercept>=0.6.1 # MIT License
wsgi_intercept>=0.6.1,<=0.9.1 # MIT License
proboscis==1.2.5.3
http://tarballs.openstack.org/python-troveclient/python-troveclient-master.tar.gz#egg=python-troveclient
mock>=1.0
mox3>=0.7.0
mock>=1.0,<=1.0.1
mox3>=0.7.0,<=0.7.0
testtools>=0.9.34,!=1.4.0,<=1.5.0
discover
discover<=0.4.0
testrepository>=0.0.18,<=0.0.20