File 0054-Merge-output-from-master_tops.patch of Package salt.4663

From 94438a76f8c2b5bf266c02f65a674836643738a9 Mon Sep 17 00:00:00 2001
From: Bo Maryniuk <bo@suse.de>
Date: Fri, 17 Mar 2017 15:07:23 +0100
Subject: [PATCH 54/54] Merge output from master_tops

---
 salt/daemons/masterapi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/daemons/masterapi.py b/salt/daemons/masterapi.py
index 29def444f3..15ea9ca41e 100644
--- a/salt/daemons/masterapi.py
+++ b/salt/daemons/masterapi.py
@@ -521,7 +521,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(
-- 
2.11.0