From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 7 Jan 2015 23:18:57 +0000 (+0100)
Subject: Merge branch 'collectd-5.4'
X-Git-Tag: collectd-5.5.0~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca316d91e178412604ea8462dc60a8bc32cbfc87;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.4'
---

ca316d91e178412604ea8462dc60a8bc32cbfc87
diff --cc src/collectd.conf.in
index dcb1a7a07,5088eaeaa..95734c266
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -733,9 -676,8 +733,9 @@@
  #		Username "user"
  #		Password "secret"
  #		Interface "eth0"
 +#		ResolveInterval 14400
  @LOAD_PLUGIN_NETWORK@	</Server>
- #	TimeToLive "128"
+ #	TimeToLive 128
  #
  #	# server setup:
  #	Listen "ff18::efc0:4a42" "25826"