From 46d949315e824ccf286c708b122ee90c6a4d720d Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Thu, 23 Jul 2015 12:54:25 +0000
Subject: [PATCH] Updated from global requirements

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

diff --git a/requirements.txt b/requirements.txt
index 47fcd9e409..026902acf6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,7 +19,7 @@ lxml>=2.3
 passlib
 python-heatclient>=0.3.0
 python-novaclient>=2.22.0
-python-cinderclient>=1.2.2
+python-cinderclient>=1.3.1
 python-keystoneclient>=1.6.0
 python-swiftclient>=2.2.0
 python-designateclient>=1.0.0
@@ -39,5 +39,5 @@ MySQL-python;python_version=='2.7'
 Babel>=1.3
 six>=1.9.0
 stevedore>=1.5.0 # Apache-2.0
-oslo.messaging>=1.16.0 # Apache-2.0
+oslo.messaging!=1.17.0,!=1.17.1,>=1.16.0 # Apache-2.0
 osprofiler>=0.3.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index eaf8cecdc4..4af5829850 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -18,8 +18,7 @@ http://tarballs.openstack.org/python-troveclient/python-troveclient-master.tar.g
 
 
 
-mock>=1.1;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
 mox3>=0.7.0
 testtools>=1.4.0
 discover