]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
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)
1  2 
src/daemon/utils_ignorelist.c
src/daemon/utils_ignorelist.h
src/utils_mount.c
src/utils_mount.h

Simple merge
Simple merge
Simple merge
Simple merge