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

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

diff --git a/requirements.txt b/requirements.txt
index 43eaafa0..42446bb4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -25,7 +25,7 @@ python-glanceclient>=0.18.0
 python-keystoneclient>=1.6.0
 python-novaclient>=2.22.0
 python-neutronclient<3,>=2.3.11
-python-cinderclient>=1.2.2
+python-cinderclient>=1.3.1
 python-manilaclient>=1.0.4
 python-heatclient>=0.3.0
 python-ceilometerclient>=1.0.13
diff --git a/test-requirements.txt b/test-requirements.txt
index 2dacc5d2..5b6c673c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,8 +6,7 @@ hacking<0.10,>=0.9.2
 coverage>=3.6
 ddt>=0.7.0
 discover
-mock!=1.1.4,>=1.1;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
 testrepository>=0.0.18
 testtools>=1.4.0