Merge pull request #279 from aboe76/fix_pillar_dict_with_default_merge

fix default dict warning with saltstack dev version
saltstack-formulas · Jan 21, 2017 · cb05073 · cb05073
2 parents b4d55b8 + caff234
commit cb05073
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/salt/files/master.d/engine.conf b/salt/files/master.d/engine.conf
@@ -1,7 +1,7 @@
 #
 # This file is managed by Salt! Do not edit by hand!
 #
-{%- set engines = salt['pillar.get']('salt:engines') -%}
+{%- set engines = salt['pillar.get']('salt:engines', {}) -%}
 {%- set engines = salt['pillar.get']('salt:master:engines', default=engines, merge=True) -%}
 {%- if engines %}
 engines:

diff --git a/salt/files/minion.d/engine.conf b/salt/files/minion.d/engine.conf
@@ -1,7 +1,7 @@
 #
 # This file is managed by Salt! Do not edit by hand!
 #
-{%- set engines = salt['pillar.get']('salt:engines') -%}
+{%- set engines = salt['pillar.get']('salt:engines', {}) -%}
 {%- set engines = salt['pillar.get']('salt:minion:engines', default=engines, merge=True) -%}
 {%- if engines %}
 engines: