Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 17 Aug 2009 07:48:43 +0000 (09:48 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 17 Aug 2009 07:48:43 +0000 (09:48 +0200)
commit8f40e8dacad2bfcb9d659e12740aa3ebc15ada65
treee600e1017481c4c0707a76b6ea3c8273a5983919
parentb6c75ecde000fd1377338a1ceb40f567ff60fbb6
parent94f2ff236902035a1d549bbe393402ec30ee245f
Merge branch 'collectd-4.6' into collectd-4.7
ChangeLog
contrib/collection3/etc/collection.conf
src/collectd.conf.pod