Skip to content

Commit 00e474c

Browse files
committed
fix(map.jinja): remove merge from config.get (for salt-ssh)
* `merge` not available via. `salt-ssh` * Additionally, fix 5dc0b86 in #95 - No option `merge=True` for `config.get`
1 parent 147760d commit 00e474c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

template/map.jinja

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
) %}
2222

2323
{#- Merge the template config (e.g. from pillar) #}
24-
{%- set template = salt['config.get']('template', default=defaults, merge=True) %}
24+
{%- set template = salt['config.get']('template', default=defaults) %}

0 commit comments

Comments
 (0)