Merge pull request #78 from saltstack-formulas/myii-patch-1

fix(map): avoid `defaults.merge` bug on `salt-ssh` (`redis_settings`)

Author: myii

redis/map.jinja

@@ -16,4 +16,4 @@
 ) %}
 
 {#- Merge the redis pillar #}
-{%- set redis = salt['pillar.get']('redis', default=defaults, merge=True) %}
+{%- set redis_settings = salt['pillar.get']('redis', default=defaults, merge=True) %}