Browse Source
Remove merge argument from pillar.get
This argument is only currently available in develop, and thus does not belong in this formula at this time.tags/v0.55.0
Erik Johnson
10 years ago
1 changed files with 1 additions and 1 deletions
+ 1
- 1
nginx/ng/map.jinja
View File
| }, | }, | ||||
| '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…