summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-20 15:11:29 +0000
committerGerrit Code Review <review@openstack.org>2015-07-20 15:11:29 +0000
commit97ae902a8dae5e5037949df9174d717c847d9fc2 (patch)
treeb11c4f66a4acaf1467ebf8d33392a92737a0d4b6
parent866114dbf684f6c02f3eaa6a02ecdc0b8ff3bc38 (diff)
parenta4088f667607a2c386009a0b45583785c5be2450 (diff)
downloadpython-designateclient-97ae902a8dae5e5037949df9174d717c847d9fc2.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 4d7517d..1055742 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,7 +4,7 @@
# Hacking already pins down pep8, pyflakes and flake8
hacking<0.10,>=0.9.2
coverage>=3.6
-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'
discover
oslotest>=1.7.0 # Apache-2.0