Pārlūkot izejas kodu

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 pirms 10 gadiem
vecāks
revīzija
01cb1f9576
1 mainītis faili ar 1 papildinājumiem un 1 dzēšanām
  1. +1
    -1
      nginx/ng/map.jinja

+ 1
- 1
nginx/ng/map.jinja Parādīt failu

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

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

Notiek ielāde…
Atcelt
Saglabāt