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 #32209 from rallytime/bp-32208

Browse source 
Back-port #32208 to 2015.8
This commit is contained in:
Nicole Thomas 2016-03-29 09:50:27 -06:00
commit 32da8d4c57
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/states/service.py
View file

@ -276,6 +276,12 @@ def running(name, enable=None, sig=None, init_delay=None, **kwargs):
number of seconds after a service has started before returning. Useful
for requisite states wherein a dependent state might assume a service
has started but is not yet fully initialized.
.. note::
``watch`` can be used with service.running to restart a service when
another state changes ( example: a file.managed state that creates the
service's config file ). More details regarding ``watch`` can be found
in the :doc:`Requisites </ref/states/requisites>` documentation.
'''
ret = {'name': name,
'changes': {},