Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2015-07-18 13:23:44 +00:00 committed by Gerrit Code Review
commit 52bdda9bae

@ -6,7 +6,7 @@ hacking<0.11,>=0.10.0
coverage>=3.6
discover
fixtures>=1.3.1
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'
oslosphinx>=2.5.0 # Apache-2.0
oslotest>=1.7.0 # Apache-2.0