update to latest upstream

diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default
index 9d7f32f..cb9cf43 100644 (file)
--- a/templates/munin-node.conf.default
+++ b/templates/munin-node.conf.default
@@ -15,6 +15,16 @@ setsid 1
 user root
 group 0
 
+# This is the timeout for the whole transaction.
+# Units are in sec. Default is 15 min
+#
+# global_timeout 900
+
+# This is the timeout for each plugin.
+# Units are in sec. Default is 1 min
+#
+# timeout 60
+
 # Regexps for files to ignore
 ignore_file [\#~]$
 ignore_file DEADJOE$