From 89ae7056dc88895697defee9d6961a1cd1efc70b Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Wed, 26 Nov 2014 20:47:57 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: I7187f8d2d19987681c2bcfeafc1617922bd684ad
---
 requirements.txt      | 18 +++++++++---------
 test-requirements.txt |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 3af5e74e7c..0420f11aca 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,14 +12,14 @@ lesscpy>=0.9j
 lockfile>=0.8
 netaddr>=0.7.6
 pbr>=0.6,<1.0
-python-ceilometerclient>=1.0.6
-python-cinderclient>=1.0.6
-python-glanceclient>=0.9.0
-python-heatclient>=0.2.3
-python-keystoneclient>=0.7.0
-python-neutronclient>=2.3.4,<3
-python-novaclient>=2.17.0
-python-swiftclient>=1.6
-python-troveclient>=1.0.3
+python-ceilometerclient>=1.0.6,<1.1
+python-cinderclient>=1.0.6,<1.2
+python-glanceclient>=0.9.0,!=0.14.0,<0.15
+python-heatclient>=0.2.3,<0.3
+python-keystoneclient>=0.7.0,<0.12
+python-neutronclient>=2.3.4,<2.4
+python-novaclient>=2.17.0,<2.21
+python-swiftclient>=1.6,<2.4
+python-troveclient>=1.0.3,<1.1
 pytz>=2010h
 six>=1.6.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 67ba616735..4b93242df6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,4 +11,4 @@ openstack.nose_plugin>=0.7
 oslosphinx
 selenium
 sphinx>=1.1.2,<1.1.999
-testtools>=0.9.34
+testtools>=0.9.34,!=1.2.0,!=1.4.0