Merge "Updated from global requirements" into stable/icehouse

2 files changed, 11 insertions, 11 deletions

diff --git a/requirements.txt b/requirements.txt
index eaab1f97f..4410d4cfb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,21 +10,21 @@ lxml>=2.3
 netaddr>=0.7.6
 six>=1.6.0
 sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2
-python-novaclient>=2.17.0
+python-novaclient>=2.17.0,<2.21
 PasteDeploy>=1.5.0
 requests>=1.1
 Routes>=1.12.3,!=2.0
 SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
 WebOb>=1.2.3
-python-heatclient>=0.2.3
-python-keystoneclient>=0.7.0
-python-swiftclient>=1.6
-python-neutronclient>=2.3.4,<3
-python-ceilometerclient>=1.0.6
-python-cinderclient>=1.0.6
-python-troveclient>=1.0.3
+python-heatclient>=0.2.3,<0.3
+python-keystoneclient>=0.7.0,<0.12
+python-swiftclient>=1.6,<2.4
+python-neutronclient>=2.3.4,<2.4
+python-ceilometerclient>=1.0.6,<1.1
+python-cinderclient>=1.0.6,<1.2
+python-troveclient>=1.0.3,<1.1
 PyYAML>=3.1.0
 paramiko>=1.9.0
 Babel>=1.3
-oslo.config>=1.2.0
+oslo.config>=1.2.0,<1.5
 qpid-python
diff --git a/test-requirements.txt b/test-requirements.txt
index 1faa43fce..6ba7bed39 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,10 +5,10 @@ coverage>=3.6
 discover
 mock>=1.0
 mox>=0.5.3
-testtools>=0.9.34
+testtools>=0.9.34,!=1.2.0,!=1.4.0
 testrepository>=0.0.18
 testscenarios>=0.4
-python-glanceclient>=0.9.0
+python-glanceclient>=0.9.0,!=0.14.0,<0.15
 sphinx>=1.1.2,<1.1.999
 oslosphinx
 lockfile>=0.8