From 699af6736abdde7840271d8032336391ce6a0de4 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Wed, 22 Jul 2015 05:01:10 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: I003b191d6ddfd85fed85313ceb6de47adb25a005
---
 test-requirements.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 0cf6b85..b87e2af 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,8 +8,7 @@ coverage>=3.6
 discover
 fixtures>=1.3.1
 requests-mock>=0.6.0 # Apache-2.0
-mock!=1.1.4,>=1.1;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
 mox3>=0.7.0
 oslosphinx>=2.5.0 # Apache-2.0
 oslotest>=1.7.0 # Apache-2.0