Merge "Updated from global requirements"

requirements.txt

@@ -1,8 +1,8 @@
 pbr>=0.6,!=0.7,<1.0
 argparse
 PrettyTable>=0.7,<0.8
-python-keystoneclient>=0.9.0
-requests>=1.1
-simplejson>=2.0.9
+python-keystoneclient>=0.10.0
+requests>=1.2.1
+simplejson>=2.2.0
 Babel>=1.3
 six>=1.7.0

test-requirements.txt

@@ -4,9 +4,9 @@ coverage>=3.6
 discover
 fixtures>=0.3.14
 mock>=1.0
-oslosphinx
+oslosphinx>=2.2.0.0a2
 python-subunit>=0.0.18
-requests-mock>=0.4.0
+requests-mock>=0.4.0  # Apache-2.0
 sphinx>=1.1.2,!=1.2.0,<1.3
 testtools>=0.9.34
 testrepository>=0.0.18