Merge branch 'collectd-5.8' into master
authorPavel Rochnyack <pavel2000@ngs.ru>
Fri, 26 Oct 2018 17:29:52 +0000 (00:29 +0700)
committerPavel Rochnyack <pavel2000@ngs.ru>
Fri, 26 Oct 2018 17:29:52 +0000 (00:29 +0700)
commitc00630eab6161514c1044e8adb2895f179a535da
tree0df78b02cf08d94b37332a8a9132316ba5768de7
parentdb13c6de0558fac44baed03c24af111c50dad7ec
parent7111bb6df7628edce3a8e538b386fbe27633a191
Merge branch 'collectd-5.8' into master

Conflicts:
src/disk.c
src/virt.c
configure.ac
src/disk.c
src/exec.c
src/ntpd.c
src/powerdns.c
src/utils_mount.c
src/virt.c
src/zfs_arc.c