summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-18 13:23:44 +0000
committerGerrit Code Review <review@openstack.org>2015-07-18 13:23:44 +0000
commit52bdda9bae3a3721b7a1e4c0366dbab8f72ffaba (patch)
tree3a96a235e1a662e4911dfb3c1fbcd7c65a9236a5
parentfcadb16470832cdde2d090a19ebd20a3ad0d1476 (diff)
parentab2c1f2b820d7fc04bf2979209198adf3417403f (diff)
downloadpython-openstackclient-52bdda9bae3a3721b7a1e4c0366dbab8f72ffaba.tar.gz
Merge "Updated from global requirements"
-rw-r--r--test-requirements.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index 24ba0f43..f9c25768 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -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