From 613694530f4887b9becb547ce256d2ef2e122903 Mon Sep 17 00:00:00 2001
From: twangboy <slee@saltstack.com>
Date: Fri, 29 Jan 2016 10:16:16 -0700
Subject: [PATCH] Revert os and os_family grains back to MacOS

---
 salt/grains/core.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/salt/grains/core.py b/salt/grains/core.py
index 6649e80bf4..84018984ad 100644
--- a/salt/grains/core.py
+++ b/salt/grains/core.py
@@ -1389,8 +1389,8 @@ def os_data():
         osrelease = __salt__['cmd.run']('sw_vers -productVersion')
         osname = __salt__['cmd.run']('sw_vers -productName')
         osbuild = __salt__['cmd.run']('sw_vers -buildVersion')
-        grains['os'] = 'Mac'
-        grains['os_family'] = 'Darwin'
+        grains['os'] = 'MacOS'
+        grains['os_family'] = 'MacOS'
         grains['osfullname'] = "{0} {1}".format(osname, osrelease)
         grains['osrelease'] = osrelease
         grains['osbuild'] = osbuild