]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Thu, 21 Jan 2016 20:26:38 +0000 (21:26 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Thu, 21 Jan 2016 20:26:38 +0000 (21:26 +0100)
1  2 
src/collectd.conf.in
src/collectd.conf.pod
src/df.c
src/virt.c

Simple merge
Simple merge
diff --cc src/df.c
Simple merge
diff --cc src/virt.c
Simple merge