Merge pull request #40329 from isbm/isbm-merge-tops-201611

Merge tops (backport)
saltstack · Mar 27, 2017 · 3a6c5d0 · 3a6c5d0
2 parents 2b7b2f1 + a762c9e
commit 3a6c5d0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/salt/daemons/masterapi.py b/salt/daemons/masterapi.py
@@ -562,7 +562,7 @@ def _ext_nodes(self, load, skip_verify=False):
             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(