salt/files/salt-0.9.8-syndic-resolution-of-master.patch

From 6c25bb24a250eaa41df02a0fe0ea696f227e8d18 Mon Sep 17 00:00:00 2001
From: Thomas S Hatch <thatch45@gmail.com>
Date: Sat, 24 Mar 2012 11:51:24 -0600
Subject: [PATCH] fix issue with syndic resolution of master 1p

---
 salt/__init__.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/salt/__init__.py b/salt/__init__.py
index 61b98e3..bce0065 100644
--- a/salt/__init__.py
+++ b/salt/__init__.py
@@ -223,7 +223,7 @@ class Syndic(object):
             # Some of the opts need to be changed to match the needed opts
             # in the minion class.
             opts['master'] = opts['syndic_master']
-            opts['master_ip'] = salt.config.dns_check(opts['master'])
+            opts['master_ip'] = salt.utils.dns_check(opts['master'])
 
             opts['master_uri'] = ('tcp://' + opts['master_ip'] +
                                   ':' + str(opts['master_port']))
-- 
1.7.8.5

1	From 6c25bb24a250eaa41df02a0fe0ea696f227e8d18 Mon Sep 17 00:00:00 2001
2	From: Thomas S Hatch <thatch45@gmail.com>
3	Date: Sat, 24 Mar 2012 11:51:24 -0600
4	Subject: [PATCH] fix issue with syndic resolution of master 1p
5
6	---
7	salt/__init__.py \| 2 +-
8	1 files changed, 1 insertions(+), 1 deletions(-)
9
10	diff --git a/salt/__init__.py b/salt/__init__.py
11	index 61b98e3..bce0065 100644
12	--- a/salt/__init__.py
13	+++ b/salt/__init__.py
14	@@ -223,7 +223,7 @@ class Syndic(object):
15	# Some of the opts need to be changed to match the needed opts
16	# in the minion class.
17	opts['master'] = opts['syndic_master']
18	- opts['master_ip'] = salt.config.dns_check(opts['master'])
19	+ opts['master_ip'] = salt.utils.dns_check(opts['master'])
20
21	opts['master_uri'] = ('tcp://' + opts['master_ip'] +
22	':' + str(opts['master_port']))
23	--
24	1.7.8.5
25