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

Fix for ext_pillar being compiled twice in legacy git_pillar code (2015.5 branch)

Browse source 
This is #28210, opened against the 2015.5 branch. This will conflict
when merged forward (into 2015.8) because of the git_pillar rewrite, and
the 2015.8 side of the conflict should be kept in all conflicts.
This commit is contained in:
Erik Johnson 2015-10-22 11:14:53 -05:00
parent bdd48c92de
commit ab991d61d9
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/git_pillar.py
View file

@ -322,4 +322,4 @@ def ext_pillar(minion_id,
pil = Pillar(opts, __grains__, minion_id, branch)
return pil.compile_pillar()
return pil.compile_pillar(ext=False)