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

Fix ret return from merge-conflict resolution

Browse source
This commit is contained in:
rallytime 2016-06-08 16:16:19 -06:00
parent b8e4706074
commit 398534a9e7
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/modules/saltutil.py
View file

@ -531,6 +531,7 @@ def sync_log_handlers(saltenv=None, refresh=True):
ret = _sync('log_handlers', saltenv)
if refresh:
refresh_modules()
return ret
def sync_pillar(saltenv=None, refresh=True):