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

Merge pull request #35390 from alexandr-orlov/2016.3

Browse Source 
Returns back missed proper grains dictionary for file module
This commit is contained in:
Mike Place 2017-01-06 11:02:12 -07:00 committed by GitHub
commit 6c2fe615aa
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/modules/file.py
View File

@ -3477,7 +3477,7 @@ def apply_template_on_contents(
to_str=True,
context=context_dict,
saltenv=saltenv,
grains=__grains__,
grains=__opts__['grains'],
pillar=__pillar__,
salt=__salt__,
opts=__opts__)['data'].encode('utf-8')
@ -3673,7 +3673,7 @@ def get_managed(
context=context_dict,
salt=__salt__,
pillar=__pillar__,
grains=__grains__,
grains=__opts__['grains'],
opts=__opts__,
**kwargs)
else: