Updated from global requirements

Change-Id: I8947fe9a024ed9ac546473b21546584961b422e8

requirements.txt

@@ -7,26 +7,26 @@ iso8601>=0.1.9
 kombu>=2.4.8
 lxml>=2.3
 netaddr>=0.7.6
-oslo.config>=1.2.0
+oslo.config>=1.2.1
 oslo.messaging>=1.3.0
 PasteDeploy>=1.5.0
 pbr>=0.6,!=0.7,<1.0
 posix_ipc
 pycrypto>=2.6
 python-ceilometerclient>=1.0.6
-python-cinderclient>=1.0.6
-python-glanceclient>=0.9.0
-python-heatclient>=0.2.3
-python-keystoneclient>=0.8.0
-python-neutronclient>=2.3.4,<3
+python-cinderclient>=1.0.7
+python-glanceclient>=0.13.1
+python-heatclient>=0.2.9
+python-keystoneclient>=0.9.0
+python-neutronclient>=2.3.5,<3
 python-novaclient>=2.17.0
 python-swiftclient>=2.0.2
 python-troveclient>=1.0.4
 PyYAML>=3.1.0
 qpid-python
 requests>=1.1
-Routes>=1.12.3
-six>=1.6.0
-SQLAlchemy>=0.7.8,<=0.9.99
+Routes>=1.12.3,!=2.0
+six>=1.7.0
+SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
 sqlalchemy-migrate>=0.9.1
 WebOb>=1.2.3

test-requirements.txt

@@ -7,7 +7,7 @@ mock>=1.0
 mox>=0.5.3
 oslosphinx
 oslotest
-sphinx>=1.2.1,<1.3
+sphinx>=1.1.2,!=1.2.0,<1.3
 testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=0.9.34