From 0de9d3f99382f56738b5112feaddb73b6abad76e Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Thu, 23 Jul 2015 04:39:21 +0000
Subject: [PATCH] Updated from global requirements

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

diff --git a/requirements.txt b/requirements.txt
index b9c4ee3f78..f0b42902fb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ oslo.context>=0.2.0 # Apache-2.0
 oslo.db>=1.12.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.log>=1.6.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
 oslo.middleware>=2.4.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.rootwrap>=2.0.0 # Apache-2.0
@@ -38,6 +38,6 @@ Routes!=2.0,>=1.12.3;python_version!='2.7'
 six>=1.9.0
 SQLAlchemy<1.1.0,>=0.9.7
 stevedore>=1.5.0 # Apache-2.0
-python-cinderclient>=1.2.2
+python-cinderclient>=1.3.1
 python-novaclient>=2.22.0
 WebOb>=1.2.3
diff --git a/test-requirements.txt b/test-requirements.txt
index 44936d3e27..3f360a5290 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,8 +10,7 @@ coverage>=3.6
 ddt>=0.7.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
 PyMySQL>=0.6.2 # MIT License
 oslotest>=1.7.0 # Apache-2.0
 oslosphinx>=2.5.0 # Apache-2.0