Revert "Remove merge argument from pillar.get"

This reverts commit f6ba9ddb59. the nginx.ng formula is only compatible with the upcoming feature release, as noted here: https://github.com/saltstack-formulas/nginx-formula#nginxng
2014-07-03 15:40:15 -05:00 · 2014-07-03 15:40:15 -05:00 · 01cb1f9576
commit 01cb1f9576
parent f6ba9ddb59
1 changed files with 1 additions and 1 deletions
--- a/nginx/ng/map.jinja
+++ b/nginx/ng/map.jinja
@ -70,7 +70,7 @@
        },
        'managed': {},
    },
-}) %}
+}, merge=True) %}

 {% if 'user' not in nginx.server.config %}
 {% do nginx.server.config.update({