Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2016-11-08 12:55:57 +00:00 committed by Gerrit Code Review
commit 28acfe1535
2 changed files with 3 additions and 3 deletions

View File

@ -6,9 +6,9 @@ Babel>=2.3.4 # BSD
cliff>=2.2.0 # Apache-2.0 cliff>=2.2.0 # Apache-2.0
osc-lib>=1.2.0 # Apache-2.0 osc-lib>=1.2.0 # Apache-2.0
oslo.i18n>=2.1.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0
oslo.utils>=3.16.0 # Apache-2.0 oslo.utils>=3.18.0 # Apache-2.0
pbr>=1.6 # Apache-2.0 pbr>=1.6 # Apache-2.0
PrettyTable<0.8,>=0.7.1 # BSD PrettyTable<0.8,>=0.7.1 # BSD
python-keystoneclient!=2.1.0,>=2.0.0 # Apache-2.0 python-keystoneclient>=3.6.0 # Apache-2.0
six>=1.9.0 # MIT six>=1.9.0 # MIT
PyYAML>=3.10.0 # MIT PyYAML>=3.10.0 # MIT

View File

@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
coverage>=3.6 # Apache-2.0 coverage>=4.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD fixtures>=3.0.0 # Apache-2.0/BSD
hacking<0.11,>=0.10.2 hacking<0.11,>=0.10.2
mock>=2.0 # BSD mock>=2.0 # BSD