Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2015-07-02 15:36:47 +00:00 committed by Gerrit Code Review
commit 15cf07a48e
2 changed files with 4 additions and 4 deletions

View File

@ -25,7 +25,7 @@ PasteDeploy>=1.5.0
pbr<2.0,>=0.11
pecan>=0.8.0
python-neutronclient<3,>=2.3.11
Routes!=2.0,>=1.12.3
Routes!=2.0,!=2.1,>=1.12.3
requests>=2.5.2
six>=1.9.0
SQLAlchemy<1.1.0,>=0.9.7
@ -35,7 +35,7 @@ suds-jurko>=0.6
setuptools
WebOb>=1.2.3
dnspython>=1.12.0
oslo.db>=1.10.0 # Apache-2.0
oslo.db>=1.12.0 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0
oslo.context>=0.2.0 # Apache-2.0
oslo.policy>=0.5.0 # Apache-2.0

View File

@ -6,7 +6,7 @@
hacking<0.10,>=0.9.2
coverage>=3.6
discover
fixtures>=0.3.14
fixtures>=1.3.1
mock>=1.0
oslotest>=1.5.1 # Apache-2.0
oslosphinx>=2.5.0 # Apache-2.0
@ -18,4 +18,4 @@ testtools>=1.4.0
testrepository>=0.0.18
testscenarios>=0.4
WebTest>=2.0
tempest-lib>=0.5.0
tempest-lib>=0.6.1