Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2015-07-18 01:31:26 +00:00 committed by Gerrit Code Review
commit 1dad55fbe2

@ -25,5 +25,5 @@ oslosphinx>=2.5.0 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0
# mocking framework
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'