Erik Johnson 01cb1f9576 Revert "Remove merge argument from pillar.get"
This reverts commit f6ba9ddb59ec1feabed6a1b4230612bf7f6d3795.

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
2013-07-28 01:04:22 +02:00
2014-05-15 18:06:48 -04:00
Languages
SaltStack 45.8%
Ruby 22.8%
Jinja 21.2%
JavaScript 7.8%
Shell 2.4%