Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2015-07-22 15:38:49 +00:00 committed by Gerrit Code Review
commit 3b3274098c
2 changed files with 2 additions and 3 deletions

View File

@ -25,7 +25,7 @@ python-glanceclient>=0.18.0
python-keystoneclient>=1.6.0
python-novaclient>=2.22.0
python-neutronclient<3,>=2.3.11
python-cinderclient>=1.2.2
python-cinderclient>=1.3.1
python-manilaclient>=1.0.4
python-heatclient>=0.3.0
python-ceilometerclient>=1.0.13

View File

@ -6,8 +6,7 @@ hacking<0.10,>=0.9.2
coverage>=3.6
ddt>=0.7.0
discover
mock!=1.1.4,>=1.1;python_version!='2.6'
mock==1.0.1;python_version=='2.6'
mock>=1.2
testrepository>=0.0.18
testtools>=1.4.0