From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 10 Jan 2014 14:39:31 +0000 (+0100)
Subject: Merge branch 'collectd-5.4'
X-Git-Tag: collectd-5.5.0~326
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac16c8169106f29d890982cce36bb4cfa7af0429;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.4'

Conflicts:
	src/write_graphite.c
---

ac16c8169106f29d890982cce36bb4cfa7af0429
diff --cc src/collectd.conf.in
index cc8f556cc,6d19c3222..4de39f0a0
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -1179,9 -1182,9 +1186,10 @@@
  #		Protocol UDP
  #		StoreRates true
  #		AlwaysAppendDS false
+ #		TTLFactor 2.0
  #	</Node>
  #	Tag "foobar"
 +#       Attribute "foo" "bar"
  #</Plugin>
  
  ##############################################################################