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

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

diff --git a/requirements.txt b/requirements.txt
index 2d7c1ad3638..18dd46bf948 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,7 +29,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
diff --git a/test-requirements.txt b/test-requirements.txt
index b2c8bc9bbd7..a39721dd329 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,8 +6,7 @@ hacking<0.11,>=0.10.0
 cliff>=1.13.0 # Apache-2.0
 coverage>=3.6
 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
 python-subunit>=0.0.18
 requests-mock>=0.6.0 # Apache-2.0
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2