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

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

diff --git a/requirements.txt b/requirements.txt
index 03f0c2330..1ec26bf2a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@
 
 pbr<2.0,>=1.3
 
-futurist>=0.1.1 # Apache-2.0
+futurist>=0.1.2 # Apache-2.0
 oslo.config>=1.11.0 # Apache-2.0
 oslo.context>=0.2.0 # Apache-2.0
 oslo.log>=1.6.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 0ce763283..2e0bbcf1b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,8 +7,7 @@ hacking<0.11,>=0.10.0
 
 discover
 fixtures>=1.3.1
-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
 python-subunit>=0.0.18
 testrepository>=0.0.18