saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Remove merge argument from pillar.get"

Browse Source 
This reverts commit f6ba9ddb59ec1feabed6a1b4230612bf7f6d3795.

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
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nginx/ng/map.jinja
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({