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 #40329 from isbm/isbm-merge-tops-201611

Browse source 
Merge tops (backport)
This commit is contained in:
Mike Place 2017-03-27 17:13:46 -06:00 • committed by GitHub
commit 3a6c5d0297
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/daemons/masterapi.py
View file

@ -562,7 +562,7 @@ class RemoteFuncs(object):
if fun not in self.opts.get('master_tops', {}):
continue
try:
ret.update(self.tops[fun](opts=opts, grains=grains))
ret = salt.utils.dictupdate.merge(ret, self.tops[fun](opts=opts, grains=grains), merge_lists=True)
except Exception as exc:
# If anything happens in the top generation, log it and move on
log.error(