Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 9 Feb 2016 22:27:12 +0000 (23:27 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 9 Feb 2016 22:27:12 +0000 (23:27 +0100)
commitf7f5868ee0378791ccd8d1788e27ebf2a02737dc
tree9ff88d87a94873a6ed339d71b826ac0373fc32e5
parentaf634d0a7cd24a7880eff332368db849c5ab3e5e
parent8fc1bf9987ab1aa8cef8c3125da82de59d93efb1
Merge branch 'collectd-5.4' into collectd-5.5
src/daemon/utils_ignorelist.c
src/daemon/utils_ignorelist.h
src/utils_mount.c
src/utils_mount.h