From 9ba3c494042b6d77a38a95978579363c27882430 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Wed, 18 May 2016 13:42:54 +0000
Subject: [PATCH] Updated from global requirements

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

diff --git a/requirements.txt b/requirements.txt
index 15d199affe..5b3158cfb1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,7 +29,7 @@ oslo.utils>=3.5.0 # Apache-2.0
 pysnmp<5.0.0,>=4.2.3 # BSD
 python-ceilometerclient>=2.2.1 # Apache-2.0
 python-glanceclient>=2.0.0 # Apache-2.0
-python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
+python-keystoneclient!=1.8.0,!=2.1.0,<3.0.0,>=1.6.0 # Apache-2.0
 keystoneauth1>=2.1.0 # Apache-2.0
 python-neutronclient!=4.1.0,>=2.6.0 # Apache-2.0
 python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 6ffbce0432..3ddf02b3ab 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,11 +4,11 @@
 
 # Hacking already pins down pep8, pyflakes and flake8
 hacking<0.11,>=0.10.0
-Babel>=1.3 # BSD
+Babel!=2.3.0,!=2.3.1,!=2.3.2,!=2.3.3,>=1.3 # BSD
 contextlib2>=0.4.0 # PSF License
 coverage>=3.6 # Apache-2.0
 elasticsearch<2.0,>=1.3.0 # Apache-2.0
-fixtures>=1.3.1 # Apache-2.0/BSD
+fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
 happybase!=0.7,>=0.5;python_version=='2.7' # MIT
 mock>=1.2 # BSD
 PyMySQL>=0.6.2 # MIT License