Merge "Updated from global requirements"

requirements.txt

@@ -1,9 +1,12 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
 pbr>=0.6,!=0.7,<1.0
 Babel>=1.3
 argparse
 PrettyTable>=0.7,<0.8
-python-keystoneclient>=0.9.0
+python-keystoneclient>=0.10.0
 pyOpenSSL>=0.11
-requests>=1.1
+requests>=1.2.1,!=2.4.0
 warlock>=1.0.1,<2
 six>=1.7.0

test-requirements.txt

@@ -1,10 +1,13 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
 hacking>=0.8.0,<0.9
 
 coverage>=3.6
 discover
 mox3>=0.7.0
 mock>=1.0
-oslosphinx
+oslosphinx>=2.2.0.0a2
 sphinx>=1.1.2,!=1.2.0,<1.3
 testrepository>=0.0.18
 testtools>=0.9.34