From 212af3df6ee173a78a1f975c90da3a39b4307272 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Wed, 22 Jul 2015 04:58:50 +0000
Subject: [PATCH] Updated from global requirements

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

diff --git a/test-requirements.txt b/test-requirements.txt
index 1eed5adb..773ccda6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,8 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 hacking<0.11,>=0.10.0
-mock!=1.1.4,>=1.1;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
 oslotest>=1.7.0 # Apache-2.0
 oslosphinx>=2.5.0 # Apache-2.0
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2