Merge pull request #318 from netmanagers/master

Fix lists join error (#317)

salt/files/master.d/reactor.conf

@@ -2,9 +2,7 @@
 # This file is managed by Salt! Do not edit by hand!
 #
 {# The parameter reactor is kept for backward compatibility -#}
-{%- set reactors = salt['pillar.get']('salt:reactor', []) -%}
-{%- set reactors = salt['pillar.get']('salt:reactors', default=reactors, merge=True) -%}
-{%- set reactors = salt['pillar.get']('salt:master:reactors', default=reactors, merge=True) -%}
+{%- set reactors = salt['pillar.get']('salt:reactor', []) + salt['pillar.get']('salt:reactors', []) + salt['pillar.get']('salt:master:reactors', []) -%}
 
 {%- if reactors %}
 reactor:

salt/files/minion.d/reactor.conf

@@ -2,9 +2,7 @@
 # This file is managed by Salt! Do not edit by hand!
 #
 {# The parameter reactor is kept for backward compatibility -#}
-{%- set reactors = salt['pillar.get']('salt:reactor', []) -%}
-{%- set reactors = salt['pillar.get']('salt:reactors', default=reactors, merge=True) -%}
-{%- set reactors = salt['pillar.get']('salt:minion:reactors', default=reactors, merge=True) -%}
+{%- set reactors = salt['pillar.get']('salt:reactor', []) + salt['pillar.get']('salt:reactors', []) + salt['pillar.get']('salt:minion:reactors', []) -%}
 
 {%- if reactors %}
 reactor: