Merge "Updated from global requirements"

requirements.txt

@@ -14,7 +14,7 @@ oslo.config>=1.2.0
 PasteDeploy>=1.5.0
 posix_ipc
 PrettyTable>=0.7,<0.8
-pycadf>=0.4.1
+pycadf>=0.5.1
 pycrypto>=2.6
 qpid-python
 requests>=1.1

test-requirements-py3.txt

@@ -8,6 +8,6 @@ oslotest
 pyzmq==2.2.0.1
 redis
 simplejson>=2.0.9
-sphinx>=1.1.2,<1.2
+sphinx>=1.2.1,<1.3
 testrepository>=0.0.18
 testtools>=0.9.34

test-requirements.txt

@@ -10,7 +10,7 @@ pylint==0.25.2
 pyzmq==2.2.0.1
 redis
 simplejson>=2.0.9
-sphinx>=1.1.2,<1.2
+sphinx>=1.2.1,<1.3
 testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=0.9.34