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

Jump to bottom

[2016.3] Merge forward from 2015.8 to 2016.3 #36023

Merged
merged 3 commits into from
Sep 2, 2016
Merged

[2016.3] Merge forward from 2015.8 to 2016.3 #36023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cf5684
Revert "service state integration tests"
Sep 2, 2016
e6b93c2
Merge pull request #36022 from saltstack/revert-33770-service_tests
Sep 2, 2016
a63c9df
Merge branch '2015.8' into '2016.3'
Sep 2, 2016
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
6 changes: 3 additions & 3 deletions salt/states/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,8 +532,8 @@ def mod_watch(name,
The name of the init or rc script used to manage the service

sfun
Required. The original function which triggered the mod_watch call.
Must be one of ``running`` or ``dead``.
The original function which triggered the mod_watch call
(`service.running`, for example).

sig
The string to search for when looking for the service process with ps
Expand Down Expand Up @@ -587,7 +587,7 @@ def mod_watch(name,
if not past_participle:
past_participle = verb + 'ed'
else:
ret['comment'] = 'sfun must be set to either "running" or "dead"'
ret['comment'] = 'Unable to trigger watch for service.{0}'.format(sfun)
ret['result'] = False
return ret

Expand Down
Loading