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:
parent
f6ba9ddb59
commit
01cb1f9576
@ -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({
|
||||||
|
Loading…
Reference in New Issue
Block a user