Merge "Updated from global requirements"

This commit is contained in:
Jenkins
2016-04-25 15:19:47 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -14,4 +14,4 @@ keystoneauth1>=2.1.0 # Apache-2.0
requests!=2.9.0,>=2.8.1 # Apache-2.0
simplejson>=2.2.0 # MIT
six>=1.9.0 # MIT
Babel>=1.3 # BSD
Babel!=2.3.0,!=2.3.1,!=2.3.2,!=2.3.3,>=1.3 # BSD

View File

@@ -5,7 +5,7 @@ hacking<0.11,>=0.10.0
coverage>=3.6 # Apache-2.0
discover # BSD
fixtures>=1.3.1 # Apache-2.0/BSD
fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
mox3>=0.7.0 # Apache-2.0
mock>=1.2 # BSD
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0