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

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

diff --git a/test-requirements.txt b/test-requirements.txt
index 2ccf34c..f32f248 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
 netaddr>=0.7.12
 
 # this is required for the docs build jobs