File activate-all-beacons-sources-config-pillar-grains.patch of Package salt.13364

From 5b48dee2f1b9a8203490e97620581b3a04d42632 Mon Sep 17 00:00:00 2001
From: Bo Maryniuk <bo@suse.de>
Date: Tue, 17 Oct 2017 16:52:33 +0200
Subject: [PATCH] Activate all beacons sources: config/pillar/grains

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

diff --git a/salt/minion.py b/salt/minion.py
index 9468695880..0a6771dccd 100644
--- a/salt/minion.py
+++ b/salt/minion.py
@@ -439,7 +439,7 @@ class MinionBase(object):
         the pillar or grains changed
         '''
         if 'config.merge' in functions:
-            b_conf = functions['config.merge']('beacons', self.opts['beacons'], omit_opts=True)
+            b_conf = functions['config.merge']('beacons', self.opts['beacons'])
             if b_conf:
                 return self.beacons.process(b_conf, self.opts['grains'])  # pylint: disable=no-member
         return []
-- 
2.13.7