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
..
files	Finishes vhost config template	2014-05-19 13:04:43 -04:00
config.sls	Fixed minor typo in nginx.ng.config.sls	2014-05-27 20:55:49 -03:00
init.sls	Fixes typo in last commit.	2014-06-19 11:25:40 -04:00
install.sls	More documentation touches.	2014-05-19 13:22:51 -04:00
map.jinja	Revert "Remove merge argument from pillar.get"	2014-07-03 15:40:15 -05:00
service.sls	More documentation touches.	2014-05-19 13:22:51 -04:00
vhosts_config.sls	Adjusts the parameters passed to context to be passed as json and hopefully avoid double quoting. Also brings indentation in-line with salt doc 23.14.1.2.1	2014-05-21 15:13:13 -04:00
vhosts.sls	Tightened up some requirements.	2014-05-21 01:01:43 -04:00