Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Sun, 8 Nov 2015 20:26:26 +0000 (21:26 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sun, 8 Nov 2015 20:26:26 +0000 (21:26 +0100)
commit9b39918bdadabb12ec040f0f191c0d21cb6ddd53
treed3d827ef3350b286bc705422e40ca7bc13f98a58
parent83bd4369fc36851bb9a92d0dd3a9d3bc6a408fdd
parent817e080279469498c446bff54dbc7e0633cb238c
Merge branch 'collectd-5.5'
src/Makefile.am
src/daemon/Makefile.am
src/daemon/plugin.c
src/daemon/utils_ignorelist.c
src/snmp.c