saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #38173 from rallytime/update-win-deprecation-versions

Browse source 
Bump some win* module deprecations from Nitrogen to Oxygen
This commit is contained in:
Mike Place 2016-12-09 09:57:29 -07:00 • committed by GitHub
commit e3c858cc28
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/win_psget.py
View file

@ -76,7 +76,7 @@ def psversion():
This has been deprecated and has been replaced by ``cmd.shell_info`` Note
the minimum version return is 5 as ``dsc`` is not available for version
less than 5. This function will be removed in 'Nitrogen' release.
less than 5. This function will be removed in 'Oxygen' release.
CLI Example:
@ -84,7 +84,7 @@ def psversion():
salt 'win01' dsc.psversion
'''
salt.utils.warn_until('Nitrogen',
salt.utils.warn_until('Oxygen',
'The \'psversion\' has been deprecated and has been '
'replaced by \'cmd.shell_info\'.'
)

18
salt/modules/win_service.py
View file

@ -953,7 +953,7 @@ def create(name,
# Deprecations
if 'binpath' in kwargs:
salt.utils.warn_until(
'Nitrogen',
'Oxygen',
'The \'binpath\' argument to service.create is deprecated, and '
'will be removed in Salt {version}. Please use \'bin_path\' '
'instead.'
@ -963,7 +963,7 @@ def create(name,
if 'DisplayName' in kwargs:
salt.utils.warn_until(
'Nitrogen',
'Oxygen',
'The \'DisplayName\' argument to service.create is deprecated, and '
'will be removed in Salt {version}. Please use \'display_name\' '
'instead.'
@ -973,7 +973,7 @@ def create(name,
if 'type' in kwargs:
salt.utils.warn_until(
'Nitrogen',
'Oxygen',
'The \'type\' argument to service.create is deprecated, and '
'will be removed in Salt {version}. Please use \'service_type\' '
'instead.'
@ -983,7 +983,7 @@ def create(name,
if 'start' in kwargs:
salt.utils.warn_until(
'Nitrogen',
'Oxygen',
'The \'start\' argument to service.create is deprecated, and '
'will be removed in Salt {version}. Please use \'start_type\' '
'instead.'
@ -993,7 +993,7 @@ def create(name,
if 'error' in kwargs:
salt.utils.warn_until(
'Nitrogen',
'Oxygen',
'The \'error\' argument to service.create is deprecated, and '
'will be removed in Salt {version}. Please use \'error_control\' '
'instead.'
@ -1003,7 +1003,7 @@ def create(name,
if 'group' in kwargs:
salt.utils.warn_until(
'Nitrogen',
'Oxygen',
'The \'group\' argument to service.create is deprecated, and '
'will be removed in Salt {version}. Please use '
'\'load_order_group\' instead.'
@ -1013,7 +1013,7 @@ def create(name,
if 'depend' in kwargs:
salt.utils.warn_until(
'Nitrogen',
'Oxygen',
'The \'depend\' argument to service.create is deprecated, and '
'will be removed in Salt {version}. Please use \'dependencies\' '
'instead.'
@ -1023,7 +1023,7 @@ def create(name,
if 'obj' in kwargs:
salt.utils.warn_until(
'Nitrogen',
'Oxygen',
'The \'obj\' argument to service.create is deprecated, and '
'will be removed in Salt {version}. Please use \'account_name\' '
'instead.'
@ -1033,7 +1033,7 @@ def create(name,
if 'password' in kwargs:
salt.utils.warn_until(
'Nitrogen',
'Oxygen',
'The \'password\' argument to service.create is deprecated, and '
'will be removed in Salt {version}. Please use '
'\'account_password\' instead.'