Merge "Update mock to get away from env markers"

This commit is contained in:
Jenkins 2015-08-14 01:36:36 +00:00 committed by Gerrit Code Review
commit 3c65652354

@ -2,8 +2,7 @@ hacking>=0.10.0,<0.11
coverage>=3.6 coverage>=3.6
discover discover
mock>=1.0;python_version!='2.6' mock>=1.2
mock==1.0.1;python_version=='2.6'
oslosphinx oslosphinx
python-keystoneclient>=0.7.0 python-keystoneclient>=0.7.0
sphinx>=1.1.2,<1.2 sphinx>=1.1.2,<1.2