From 62ab6a95029fe96a217727dd58ec4494902a2c00 Mon Sep 17 00:00:00 2001
From: Roshan Bangera <roshan@mashable.com>
Date: Wed, 13 May 2015 19:00:12 -0500
Subject: [PATCH]  * added pillar variable to specify os release version for
 nginx package repo base url for RedHat family os hosts

 * added comment for pillar example
 * removed override releasever variable use for CentOS
---
 nginx/ng/map.jinja | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nginx/ng/map.jinja b/nginx/ng/map.jinja
index ea0ddc5..62f9700 100644
--- a/nginx/ng/map.jinja
+++ b/nginx/ng/map.jinja
@@ -24,7 +24,10 @@
             'vhost_available': '/etc/nginx/conf.d',
             'vhost_enabled': '/etc/nginx/conf.d',
             'vhost_use_symlink': False,
+<<<<<<< HEAD
             'pid_file': '/var/run/nginx.pid',
+=======
+>>>>>>>  * added pillar variable to specify os release version for nginx package repo base url for RedHat family os hosts
             'rh_os_releasever': '$releasever',
         },
         'Suse': {