Merge "Updated from global requirements"

requirements.txt

@@ -5,10 +5,10 @@
 pbr>=0.6,!=0.7,<1.0
 
 Babel>=1.3
-netaddr>=0.7.6
-oslo.i18n>=0.1.0  # Apache-2.0
+netaddr>=0.7.12
+oslo.i18n>=0.3.0  # Apache-2.0
 python-keystoneclient>=0.10.0
-requests>=1.2.1
+requests>=1.2.1,!=2.4.0
 six>=1.7.0
 PrettyTable>=0.7,<0.8
 argparse

test-requirements.txt

@@ -6,10 +6,10 @@ hacking>=0.9.2,<0.10
 coverage>=3.6
 mock>=1.0
 discover
-oslosphinx
+oslosphinx>=2.2.0.0a2
 testrepository>=0.0.18
 sphinx>=1.1.2,!=1.2.0,<1.3
 python-swiftclient>=2.2.0
-python-novaclient>=2.17.0
+python-novaclient>=2.18.0
 python-neutronclient>=2.3.6,<3
 oslo.config>=1.4.0.0a3