nginx-formula/nginx
Erik Johnson 01cb1f9576 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
2014-07-03 15:40:15 -05:00
..
ng Revert "Remove merge argument from pillar.get" 2014-07-03 15:40:15 -05:00
templates Merge pull request #30 from the-control-group/feature/set-real-ip 2014-06-24 14:13:56 -06:00
common.sls Add pillar item to disable using upstart-based services 2014-05-04 11:15:04 -07:00
init.sls Optionally include nginx.users via a pillar value 2014-06-15 22:01:14 -07:00
luajit2.sls Re-organize nginx formula files 2013-09-25 15:50:25 -04:00
map.jinja Added map file to resolve apache utils package name 2014-06-18 11:57:05 +02:00
openresty.sls Re-organize nginx formula files 2013-09-25 15:50:25 -04:00
package.sls Add tab completion for upstart 2014-06-19 10:43:00 -04:00
source.sls Correct requisite ID in source.sls 2014-05-30 19:31:00 +03:00
users.sls Added map file to resolve apache utils package name 2014-06-18 11:57:05 +02:00