From 01cb1f9576605326f3065857db7ea7e6f8762f60 Mon Sep 17 00:00:00 2001
From: Erik Johnson <palehose@gmail.com>
Date: Thu, 3 Jul 2014 15:40:15 -0500
Subject: [PATCH] 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
---
 nginx/ng/map.jinja | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx/ng/map.jinja b/nginx/ng/map.jinja
index e06ccf8..4cb455f 100644
--- a/nginx/ng/map.jinja
+++ b/nginx/ng/map.jinja
@@ -70,7 +70,7 @@
         },
         'managed': {},
     },
-}) %}
+}, merge=True) %}
 
 {% if 'user' not in nginx.server.config %}
 {% do nginx.server.config.update({