Merge "Updated from global requirements"

2015-07-22 22:54:28 +00:00 · 2015-07-22 22:54:28 +00:00 · fae0daecdc
commit fae0daecdc
parent 25b9cdc9eb a06e152da9
2 changed files with 2 additions and 3 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -4,7 +4,7 @@

 pbr<2.0,>=1.3

-futurist>=0.1.1 # Apache-2.0
+futurist>=0.1.2 # Apache-2.0
 oslo.config>=1.11.0 # Apache-2.0
 oslo.context>=0.2.0 # Apache-2.0
 oslo.log>=1.6.0 # Apache-2.0
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -7,8 +7,7 @@ hacking<0.11,>=0.10.0

 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
 mox3>=0.7.0
 python-subunit>=0.0.18
 testrepository>=0.0.18