Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master Port #49826 #55685

Merged
merged 4 commits into from
Dec 21, 2019
Merged

Master Port #49826 #55685

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ffb824c
Remove warnings/support for force option for Neon
Sep 28, 2018
137a717
do not deprecate force to ensure backwards compatibility
Ch3LL Dec 20, 2019
2d7378d
fix win_servermanager docs
Ch3LL Dec 20, 2019
a7cf0ca
re-add use of **kwargs
Ch3LL Dec 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions salt/states/win_servermanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

# Import salt modules
import salt.utils.data
import salt.utils.versions


def __virtual__():
Expand Down Expand Up @@ -58,7 +57,10 @@ def installed(name,
recurse (Optional[bool]):
Install all sub-features as well. If the feature is installed but
one of its sub-features are not installed set this will install
additional sub-features
additional sub-features. This argument was previously renamed from
``force``. To ensure backwards compatibility ``force`` will
continue to work but please update your states to use the preferred
``recurse`` arg.

source (Optional[str]):
Path to the source files if missing from the target system. None
Expand Down Expand Up @@ -114,12 +116,6 @@ def installed(name,
- Web-Server
'''
if 'force' in kwargs:
salt.utils.versions.warn_until(
'Neon',
'Parameter \'force\' has been detected in the argument list. This'
'parameter is no longer used and has been replaced by \'recurse\''
'as of Salt 2018.3.0. This warning will be removed in Salt Neon.'
)
kwargs.pop('force')

ret = {'name': name,
Expand Down