Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2015-07-20 15:11:29 +00:00 committed by Gerrit Code Review
commit 97ae902a8d

View File

@ -4,7 +4,7 @@
# Hacking already pins down pep8, pyflakes and flake8 # Hacking already pins down pep8, pyflakes and flake8
hacking<0.10,>=0.9.2 hacking<0.10,>=0.9.2
coverage>=3.6 coverage>=3.6
mock>=1.1;python_version!='2.6' mock!=1.1.4,>=1.1;python_version!='2.6'
mock==1.0.1;python_version=='2.6' mock==1.0.1;python_version=='2.6'
discover discover
oslotest>=1.7.0 # Apache-2.0 oslotest>=1.7.0 # Apache-2.0