Merge "Updated from global requirements"

Author: Jenkins

requirements.txt

@@ -7,10 +7,10 @@ oslo.i18n>=1.0.0  # Apache-2.0
 oslo.utils>=1.0.0                       # Apache-2.0
 pbr>=0.6,!=0.7,<1.0
 python-glanceclient>=0.14.0
-python-keystoneclient>=0.10.0
+python-keystoneclient>=0.11.1
 python-novaclient>=2.18.0
 python-cinderclient>=1.1.0
 python-neutronclient>=2.3.6,<3
-requests>=1.2.1,!=2.4.0
+requests>=2.2.0,!=2.4.0
 six>=1.7.0
-stevedore>=1.0.0
+stevedore>=1.0.0  # Apache-2.0

test-requirements.txt

@@ -9,7 +9,7 @@ fixtures>=0.3.14
 mock>=1.0
 oslosphinx>=2.2.0  # Apache-2.0
 requests-mock>=0.4.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,<1.3
+sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 testrepository>=0.0.18
 testtools>=0.9.34
 WebOb>=1.2.3