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

Merge pull request #23549 from vr-jack/develop

Browse Source 
Update __init__.py
This commit is contained in:
Thomas S Hatch 2015-05-12 09:17:02 -06:00
commit e91e229a87
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/pillar/__init__.py
View File

@ -283,7 +283,8 @@ class Pillar(object):
),
self.rend,
self.opts['renderer'],
self.opts['environment']
self.opts['environment'],
_pillar_rend=True
)
]
else:
@ -298,7 +299,8 @@ class Pillar(object):
top,
self.rend,
self.opts['renderer'],
saltenv=saltenv
saltenv=saltenv,
_pillar_rend=True
)
)
except Exception as exc:
@ -335,7 +337,8 @@ class Pillar(object):
).get('dest', False),
self.rend,
self.opts['renderer'],
saltenv=saltenv
saltenv=saltenv,
_pillar_rend=True
)
)
except Exception as exc: