Merge "Updated from global requirements"

requirements.txt

@@ -10,16 +10,16 @@ lxml>=2.3
 netaddr
 six
 sqlalchemy-migrate>=0.7.2
-python-novaclient>=2.12.0
+python-novaclient>=2.15.0
 PasteDeploy>=1.5.0
 Routes>=1.12.3
 SQLAlchemy>=0.7.8,<=0.7.99
 WebOb>=1.2.3,<1.3
 python-keystoneclient>=0.3.2
-python-swiftclient>=1.2
+python-swiftclient>=1.5
 python-neutronclient>=2.3.0,<3
 python-ceilometerclient>=1.0.5
-python-cinderclient>=1.0.4
+python-cinderclient>=1.0.5
 PyYAML>=3.1.0
 paramiko>=1.8.0
 Babel>=0.9.6

setup.py

@@ -18,5 +18,5 @@
 import setuptools
 
 setuptools.setup(
-    setup_requires=['pbr>=0.5.21,<1.0'],
+    setup_requires=['pbr'],
     pbr=True)

test-requirements.txt

@@ -1,8 +1,8 @@
 # Install bounded pep8/pyflakes first, then let flake8 install
 pep8==1.4.5
-pyflakes==0.7.2
+pyflakes>=0.7.2,<0.7.4
 flake8==2.0
-hacking>=0.5.6,<0.7
+hacking>=0.5.6,<0.8
 
 coverage>=3.6
 discover