Merge "Updated from global requirements" into stable/kilo

Author: Jenkins

requirements.txt

@@ -5,10 +5,10 @@ pbr>=0.6,!=0.7,<1.0
 Babel>=1.3
 argparse
 PrettyTable>=0.7,<0.8
-python-keystoneclient>=1.0.0
+python-keystoneclient>=1.1.0,<1.4.0
 pyOpenSSL>=0.11
 requests>=2.2.0,!=2.4.0
 warlock>=1.0.1,<2
-six>=1.7.0
-oslo.utils>=1.2.0                       # Apache-2.0
-oslo.i18n>=1.3.0  # Apache-2.0
+six>=1.9.0
+oslo.utils>=1.4.0,<1.5.0                       # Apache-2.0
+oslo.i18n>=1.5.0,<1.6.0  # Apache-2.0

test-requirements.txt

@@ -7,7 +7,7 @@ coverage>=3.6
 discover
 mox3>=0.7.0
 mock>=1.0
-oslosphinx>=2.2.0  # Apache-2.0
+oslosphinx>=2.5.0,<2.6.0  # Apache-2.0
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 testrepository>=0.0.18
 testtools>=0.9.36,!=1.2.0