Merge branch 'collectd-5.7' into collectd-5.8
authorPavel Rochnyack <pavel2000@ngs.ru>
Fri, 26 Oct 2018 15:06:35 +0000 (22:06 +0700)
committerPavel Rochnyack <pavel2000@ngs.ru>
Fri, 26 Oct 2018 15:06:35 +0000 (22:06 +0700)
commit7111bb6df7628edce3a8e538b386fbe27633a191
tree7c10beb7d111154766efc2fe3e2df64959c343a2
parentdeb7d3cfd23c8e9e2b43e41f998fdea85fb4bab8
parent4c0848b1fb7cd097eeec947892d7bad5fd178ad7
Merge branch 'collectd-5.7' into collectd-5.8

Conflicts:
src/utils_mount.c
src/utils_mount.c
src/zfs_arc.c