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 #36807 from terminalmage/issue36723

Browse source 
Fix pillar merging when ext_pillar_first is enabled
This commit is contained in:
Thomas S Hatch 2016-10-13 13:40:55 -06:00 • committed by GitHub
commit c6254d59fd
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/pillar/__init__.py
View file

@ -791,8 +791,8 @@ class Pillar(object):
self.opts['pillar'], errors = self.ext_pillar({}, pillar_dirs)
matches = self.top_matches(top)
pillar, errors = self.render_pillar(matches, errors=errors)
pillar = merge(pillar,
self.opts['pillar'],
pillar = merge(self.opts['pillar'],
pillar,
self.merge_strategy,
self.opts.get('renderer', 'yaml'),
self.opts.get('pillar_merge_lists', False))