Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 6 Mar 2016 11:08:59 +0000 (12:08 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 6 Mar 2016 11:08:59 +0000 (12:08 +0100)
commit2cf10557f58144e13793a3d69ae5d4b7c8d6c305
treee7bd4af34af638876e75f1bd5796990a5d95f584
parent1fc00932fd49fa535551cc4bba09c4e4be059ab4
parentaf6222065f1f5d8969afdde89c9f26a73e1e1690
Merge branch 'collectd-5.4' into collectd-5.5
src/utils_mount.c
src/zfs_arc.c