Code

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)
commit218c57128f2e54960133cff3e774b5ef9944068a
tree5612748fba45e1fe1d796e8c371370f7a05484fd
parent778a6720a300cf549f5bcca9c22a3ef09d97f16f
parent01bb122fca4bd5c767b795f9cff364d01f0573c3
Merge branch 'collectd-5.4' into collectd-5.5
src/collectd.conf.in
src/collectd.conf.pod
src/df.c
src/virt.c