Updated from global requirements

Change-Id: Ib5943dac98089f4f1aae6bf5b0109595a2bb166f

requirements.txt

@@ -20,7 +20,7 @@ argparse
 boto>=2.32.1
 sqlalchemy-migrate>=0.9.1,!=0.9.2
 httplib2>=0.7.5
-kombu>=2.4.8
+kombu>=2.5.0
 pycrypto>=2.6
 iso8601>=0.1.9
 ordereddict
@@ -43,7 +43,7 @@ oslo.vmware>=0.6.0                      # Apache-2.0
 Paste
 
 jsonschema>=2.0.0,<3.0.0
-python-cinderclient>=1.0.7
+python-cinderclient>=1.1.0
 python-keystoneclient>=0.10.0
 pyOpenSSL>=0.11
 
@@ -55,7 +55,7 @@ oslo.i18n>=1.0.0  # Apache-2.0
 oslo.messaging>=1.4.0
 oslo.serialization>=1.0.0               # Apache-2.0
 
-retrying>=1.2.2 # Apache-2.0
+retrying>=1.2.2,!=1.3.0 # Apache-2.0
 osprofiler>=0.3.0                       # Apache-2.0
 
 # Glance Store

test-requirements.txt

@@ -15,11 +15,11 @@ fixtures>=0.3.14
 mox>=0.5.3
 mock>=1.0
 sphinx>=1.1.2,!=1.2.0,<1.3
-requests>=1.2.1,!=2.4.0
+requests>=2.2.0,!=2.4.0
 testrepository>=0.0.18
 testtools>=0.9.34
 psutil>=1.1.1,<2.0.0
-oslotest>=1.1.0
+oslotest>=1.1.0  # Apache-2.0
 # Optional packages that should be installed when testing
 MySQL-python
 psycopg2