Merge "Updated from global requirements"

This commit is contained in:
Jenkins
2015-07-23 03:26:49 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 3 deletions

View File

@@ -14,7 +14,7 @@ six>=1.9.0
enum34;python_version=='2.7' or python_version=='2.6'
# For async and/or periodic work
futurist>=0.1.1 # Apache-2.0
futurist>=0.1.2 # Apache-2.0
# For reader/writer + interprocess locks.
fasteners>=0.7 # Apache-2.0

View File

@@ -4,8 +4,7 @@
hacking<0.11,>=0.10.0
oslotest>=1.7.0 # Apache-2.0
mock!=1.1.4,>=1.1;python_version!='2.6'
mock==1.0.1;python_version=='2.6'
mock>=1.2
testtools>=1.4.0
testscenarios>=0.4