Merge pull request #44740 from rallytime/develop-bump-oxygen-warnings

[develop] Bump deprecation notice in utils/args from Oxygen to Fluorine
This commit is contained in:
Nicole Thomas 2017-12-01 10:22:35 -05:00 committed by GitHub
commit cd79d7cb75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -451,10 +451,10 @@ def format_call(fun,
continue
extra[key] = copy.deepcopy(value)
# We'll be showing errors to the users until Salt Oxygen comes out, after
# We'll be showing errors to the users until Salt Fluorine comes out, after
# which, errors will be raised instead.
salt.utils.versions.warn_until(
'Oxygen',
'Fluorine',
'It\'s time to start raising `SaltInvocationError` instead of '
'returning warnings',
# Let's not show the deprecation warning on the console, there's no
@ -491,7 +491,7 @@ def format_call(fun,
'{0}. If you were trying to pass additional data to be used '
'in a template context, please populate \'context\' with '
'\'key: value\' pairs. Your approach will work until Salt '
'Oxygen is out.{1}'.format(
'Fluorine is out.{1}'.format(
msg,
'' if 'full' not in ret else ' Please update your state files.'
)