Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Sun, 28 Feb 2016 00:12:42 +0000 (01:12 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sun, 28 Feb 2016 00:12:42 +0000 (01:12 +0100)
commit6258e772d808f4e76ea8e23d9e2750cfc7e6c60d
tree09108c2179b8f5985e01f8ddb70d07e30adb1622
parentd3f8bb573b981294a614a25fc425f8cf97390275
parent8de8814283aa62c1bb29324d9814437da710850f
Merge branch 'collectd-5.4' into collectd-5.5
configure.ac
contrib/redhat/collectd.spec
src/collectd.conf.pod
src/processes.c