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
This commit is contained in:
Erik Johnson 2014-07-03 15:40:15 -05:00
parent f6ba9ddb59
commit 01cb1f9576

View File

@ -70,7 +70,7 @@
}, },
'managed': {}, 'managed': {},
}, },
}) %} }, merge=True) %}
{% if 'user' not in nginx.server.config %} {% if 'user' not in nginx.server.config %}
{% do nginx.server.config.update({ {% do nginx.server.config.update({