Merge pull request #279 from aboe76/fix_pillar_dict_with_default_merge

fix default dict warning with saltstack dev version

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:

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: