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 branch '2016.11' into '2017.7'

Browse source 
Conflicts:
  - salt/modules/win_lgpo.py
This commit is contained in:
rallytime 2017-12-30 08:32:16 -05:00
commit 508599e159
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/states/status.py
View file

@ -66,7 +66,7 @@ def process(name):
'data': {}} # Data field for monitoring state
data = __salt__['status.pid'](name)
if name not in data:
if not data:
ret['result'] = False
ret['comment'] += 'Process signature "{0}" not found '.format(
name