Merge "Updated from global requirements"

requirements.txt

@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 pbr>=1.8 # Apache-2.0
-docker-py<1.8.0,>=1.6.0 # Apache-2.0
+docker-py!=1.8.0,>=1.6.0 # Apache-2.0
 Jinja2>=2.8 # BSD License (3 clause)
 gitdb>=0.6.4 # BSD License (3 clause)
 GitPython>=1.0.1 # BSD License (3 clause)

test-requirements.txt

@@ -16,7 +16,7 @@ PrettyTable<0.8,>=0.7.1 # BSD
 PyYAML>=3.10.0 # MIT
 python-barbicanclient>=4.0.0 # Apache-2.0
 python-ceilometerclient>=2.5.0 # Apache-2.0
-python-heatclient>=1.5.0 # Apache-2.0
+python-heatclient!=1.6.0,>=1.5.0 # Apache-2.0
 python-neutronclient>=5.1.0 # Apache-2.0
 python-openstackclient>=3.3.0 # Apache-2.0
 python-swiftclient>=2.2.0 # Apache-2.0