From 2243f25be5c3406836737972915ced140e9814ab Mon Sep 17 00:00:00 2001
From: Andreas Lutro <anlutro@gmail.com>
Date: Tue, 2 Feb 2016 15:50:20 +0100
Subject: [PATCH] Properly set the default value for pillar_merge_lists

Issue: #30809
Related PRs: #30062 #30458
---
 salt/pillar/__init__.py   | 8 ++++----
 salt/pillar/git_pillar.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/salt/pillar/__init__.py b/salt/pillar/__init__.py
index 9bbcc66b6ab5..8d15cf60aab9 100644
--- a/salt/pillar/__init__.py
+++ b/salt/pillar/__init__.py
@@ -535,7 +535,7 @@ def render_pstate(self, sls, saltenv, mods, defaults=None):
                                         nstate,
                                         self.merge_strategy,
                                         self.opts.get('renderer', 'yaml'),
-                                        self.opts.get('pillar_merge_lists', 'False'))
+                                        self.opts.get('pillar_merge_lists', False))
 
                                 if err:
                                     errors += err
@@ -573,7 +573,7 @@ def render_pillar(self, matches):
                         pstate,
                         self.merge_strategy,
                         self.opts.get('renderer', 'yaml'),
-                        self.opts.get('pillar_merge_lists', 'False'))
+                        self.opts.get('pillar_merge_lists', False))
 
         return pillar, errors
 
@@ -660,7 +660,7 @@ def ext_pillar(self, pillar, pillar_dirs):
                     ext,
                     self.merge_strategy,
                     self.opts.get('renderer', 'yaml'),
-                    self.opts.get('pillar_merge_lists', 'False'))
+                    self.opts.get('pillar_merge_lists', False))
                 ext = None
         return pillar
 
@@ -678,7 +678,7 @@ def compile_pillar(self, ext=True, pillar_dirs=None):
                                self.opts['pillar'],
                                self.merge_strategy,
                                self.opts.get('renderer', 'yaml'),
-                               self.opts.get('pillar_merge_lists', 'False'))
+                               self.opts.get('pillar_merge_lists', False))
             else:
                 matches = self.top_matches(top)
                 pillar, errors = self.render_pillar(matches)
diff --git a/salt/pillar/git_pillar.py b/salt/pillar/git_pillar.py
index e9a39de09524..bdd9645db3b6 100644
--- a/salt/pillar/git_pillar.py
+++ b/salt/pillar/git_pillar.py
@@ -262,7 +262,7 @@ def ext_pillar(minion_id, repo, pillar_dirs):
         )
         merge_lists = __opts__.get(
             'pillar_merge_lists',
-            'False'
+            False
         )
         for pillar_dir, env in six.iteritems(pillar.pillar_dirs):
             log.debug(