From f4a823a89689843dd0ada076279d6ac8298f22e1 Mon Sep 17 00:00:00 2001
From: John Carlyle-Clarke <john.carlyle-clarke@fastmarkets.com>
Date: Thu, 9 Jul 2015 10:45:01 +0100
Subject: [PATCH] Fix problem with code to include extra files in minion config

---
 salt/files/minion.d/f_defaults.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf
index c81113f..0cbd9b1 100644
--- a/salt/files/minion.d/f_defaults.conf
+++ b/salt/files/minion.d/f_defaults.conf
@@ -163,7 +163,7 @@ mine_functions:
 
 # include extra config
 {% if 'include' in cfg_minion -%}
-    {% if isinstance(cfg_minion['include'], list) -%}
+    {% if cfg_minion['include'] is iterable -%}
         include:
         {% for include in cfg_minion['include'] -%}
             - {{ include }}
@@ -172,7 +172,7 @@ mine_functions:
         include: cfg_minion['include']
     {% endif -%}
 {% elif 'include' in cfg_salt -%}
-    {% if isinstance(cfg_salt['include'], list) -%}
+    {% if cfg_salt['include'] is iterable -%}
         include:
         {% for include in cfg_salt['include'] -%}
             - {{ include }}