Merge "Updated from global requirements"

requirements.txt

@@ -2,7 +2,7 @@ pbr>=0.5.21,<1.0
 argparse
 httplib2
 iso8601>=0.1.8
-PrettyTable>=0.6,<0.8
+PrettyTable>=0.7,<0.8
 python-keystoneclient>=0.4.1
 PyYAML>=3.1.0
 six>=1.4.1

test-requirements.txt

@@ -9,7 +9,7 @@ fixtures>=0.3.14
 mock>=1.0
 mox>=0.5.3
 mox3>=0.7.0
-sphinx>=1.1.2
+sphinx>=1.1.2,<1.2
 testscenarios>=0.4
 testrepository>=0.0.17
 testtools>=0.9.32