From fa258ab1ff0f64c96f0e186eb23a25562cb56dc7 Mon Sep 17 00:00:00 2001
From: Thomas S Hatch <thatch45@gmail.com>
Date: Thu, 24 Mar 2011 21:53:47 -0600
Subject: [PATCH] Add new configuration options to the default configuration
 files

---
 conf/master | 6 ++++++
 conf/minion | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/conf/master b/conf/master
index 26882eaa9d6..b0fe7f8c661 100644
--- a/conf/master
+++ b/conf/master
@@ -22,3 +22,9 @@
 # Enable auto_accept, this setting will automatically accept all incoming
 # public keys from the minions
 #auto_accept: False
+# Logging information:
+#log_file: /var/log/salt/master
+#log_level: WARNING
+# The log level for posting to the terminal
+#out_level: ERROR
+
diff --git a/conf/minion b/conf/minion
index 7d1434a99e7..c23611cb518 100644
--- a/conf/minion
+++ b/conf/minion
@@ -16,3 +16,9 @@
 # the situation where your keys end up in a bad state. If you run in open more
 # you do so at your own risk!
 #open_mode: False
+# Logging information:
+#log_file: /var/log/salt/master
+#log_level: WARNING
+# The log level for posting to the terminal
+#out_level: ERROR
+