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

Depends-On: Idb046b0e4e23af49c947a80cf6f77fef3a9ec0c8

Change-Id: Id9969fbda10a86dd79d1000ec5ba5c34152fd162
---
 requirements.txt      | 2 +-
 test-requirements.txt | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4c9740c3..7ae90991 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ six>=1.9.0
 enum34;python_version=='2.7' or python_version=='2.6'
 
 # For async and/or periodic work
-futurist>=0.1.1 # Apache-2.0
+futurist>=0.1.2 # Apache-2.0
 
 # For reader/writer + interprocess locks.
 fasteners>=0.7 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index b0ed54cf..5a06c57d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,8 +4,7 @@
 
 hacking<0.11,>=0.10.0
 oslotest>=1.7.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
 testtools>=1.4.0
 testscenarios>=0.4