浏览代码

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
tags/v0.55.0
Erik Johnson 10 年前
父节点
当前提交
01cb1f9576
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. +1
    -1
      nginx/ng/map.jinja

+ 1
- 1
nginx/ng/map.jinja 查看文件

@@ -70,7 +70,7 @@
},
'managed': {},
},
}) %}
}, merge=True) %}

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

正在加载...
取消
保存