From 00e474cdc25c0bc8502826336138cdec9d0c71f5 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 15 May 2019 15:37:02 +0100 Subject: [PATCH] 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` --- template/map.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/map.jinja b/template/map.jinja index d3fe4ce0..5aed3601 100644 --- a/template/map.jinja +++ b/template/map.jinja @@ -21,4 +21,4 @@ ) %} {#- Merge the template config (e.g. from pillar) #} -{%- set template = salt['config.get']('template', default=defaults, merge=True) %} +{%- set template = salt['config.get']('template', default=defaults) %}