Merge "Updated from global requirements"

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

View File

@ -29,7 +29,7 @@ saml2 =
lxml>=2.3 # BSD lxml>=2.3 # BSD
betamax = betamax =
betamax>=0.5.1 # Apache-2.0 betamax>=0.5.1 # Apache-2.0
fixtures>=1.3.1 # Apache-2.0/BSD fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
mock>=1.2 # BSD mock>=1.2 # BSD
[entry_points] [entry_points]

View File

@ -7,7 +7,7 @@ flake8-docstrings==0.2.1.post1 # MIT
coverage>=3.6 # Apache-2.0 coverage>=3.6 # Apache-2.0
discover # BSD discover # BSD
fixtures>=1.3.1 # Apache-2.0/BSD fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
mock>=1.2 # BSD mock>=1.2 # BSD
oslo.config>=3.9.0 # Apache-2.0 oslo.config>=3.9.0 # Apache-2.0
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0