Merge "Updated from global requirements"

requirements.txt

@@ -3,7 +3,7 @@ cliff>=1.4.3
 keyring>=2.1
 pycrypto>=2.6
 python-glanceclient>=0.9.0
-python-keystoneclient>=0.8.0
+python-keystoneclient>=0.9.0
 python-novaclient>=2.17.0
 python-cinderclient>=1.0.6
 requests>=1.1

test-requirements.txt

@@ -1,10 +1,10 @@
-hacking>=0.8.0,<0.9
+hacking>=0.9.1,<0.10
 
 coverage>=3.6
 discover
 fixtures>=0.3.14
 mock>=1.0
-sphinx>=1.1.2,<1.2
+sphinx>=1.1.2,!=1.2.0,<1.3
 testrepository>=0.0.18
 testtools>=0.9.34
 WebOb>=1.2.3