Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Thu, 17 Dec 2015 12:41:46 +0000 (13:41 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 17 Dec 2015 12:41:46 +0000 (13:41 +0100)
commit4bca6c6b7e03ab4aa0d6a8a59dda3e44608f63f1
treecede77e4937efd5288262e821c6d0d5c6a00e3b8
parent05ec6a8938ab154b3572cb7bfe7204b00c989575
parentea3a86f0ff50f12650aae7eea033984a8ae0eba5
Merge branch 'collectd-5.5'
configure.ac
src/barometer.c
src/collectd.conf.pod
src/zfs_arc.c