Updated from global requirements

Change-Id: I7fc281b80342a14e11f87afb41c3abc515d8487c

Author: OpenStack Proposal Bot

requirements.txt

@@ -14,7 +14,7 @@ oslo.utils>=1.9.0 # Apache-2.0
 python-glanceclient>=0.18.0
 python-keystoneclient>=1.6.0
 python-novaclient>=2.22.0
-python-cinderclient>=1.2.2
+python-cinderclient>=1.3.1
 python-neutronclient<3,>=2.3.11
 requests>=2.5.2
 stevedore>=1.5.0 # Apache-2.0

test-requirements.txt

@@ -6,8 +6,7 @@ hacking<0.11,>=0.10.0
 coverage>=3.6
 discover
 fixtures>=1.3.1
-mock!=1.1.4,>=1.1;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
 oslosphinx>=2.5.0 # Apache-2.0
 oslotest>=1.7.0 # Apache-2.0
 requests-mock>=0.6.0 # Apache-2.0