Merge "Updated from global requirements"

This commit is contained in:
Jenkins
2015-07-04 08:00:51 +00:00
committed by Gerrit Code Review

View File

@@ -6,7 +6,7 @@ hacking<0.11,>=0.10.0
cliff-tablib>=1.0
coverage>=3.6
discover
fixtures>=0.3.14
fixtures>=1.3.1
mox3>=0.7.0
mock>=1.0
oslosphinx>=2.5.0 # Apache-2.0
@@ -16,4 +16,4 @@ requests-mock>=0.6.0 # Apache-2.0
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
testrepository>=0.0.18
testtools>=1.4.0
tempest-lib>=0.5.0
tempest-lib>=0.6.1