Merge "Block mock 1.1.4"

This commit is contained in:
Jenkins 2015-07-17 16:10:12 +00:00 committed by Gerrit Code Review
commit 03f02d7b6d

@ -241,7 +241,7 @@ httpretty>=0.8.4,<0.8.7
kafka-python>=0.9.2 # Apache-2.0
keyring>=2.1,!=3.3
ldappool>=1.0 # MPL
mock>=1.1;python_version!='2.6'
mock>=1.1,!=1.1.4;python_version!='2.6'
mock==1.0.1;python_version=='2.6'
mox>=0.5.3
mox3>=0.7.0