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

Remove merge argument from pillar.get

Browse Source 
This argument is only currently available in develop, and thus does not
belong in this formula at this time.
This commit is contained in:
Erik Johnson 2014-07-03 12:53:13 -05:00
parent 7febd2deb6
commit f6ba9ddb59
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({