valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix merge error

Browse Source
This commit is contained in:
Kris Raney 2016-02-26 11:49:36 -06:00
parent 0aa6334442
commit 279ab9d468
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/pillar/__init__.py
View File

@ -756,7 +756,7 @@ class Pillar(object):
'The \'ext_pillar_first\' option has been deprecated and ' 'The \'ext_pillar_first\' option has been deprecated and '
'replaced by \'pillar_roots_override_ext_pillar\'.' 'replaced by \'pillar_roots_override_ext_pillar\'.'
) )
self.opts['pillar'] = self.ext_pillar({}, pillar_dirs) self.opts['pillar'], errors = self.ext_pillar({}, pillar_dirs)
matches = self.top_matches(top) matches = self.top_matches(top)
pillar, errors = self.render_pillar(matches, errors=errors) pillar, errors = self.render_pillar(matches, errors=errors)
if self.opts.get('pillar_roots_override_ext_pillar', False): if self.opts.get('pillar_roots_override_ext_pillar', False):