Code

Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Sun, 8 Nov 2015 16:14:54 +0000 (17:14 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sun, 8 Nov 2015 16:14:54 +0000 (17:14 +0100)
commit21a4ddcc2d66eea59224fd95746c7533b1b1a46d
treea893b10769fd2050ad27dabbfd0b563ed1217185
parentdab48f284f9d4bb6ae98244310c5cdb6c5d91bf3
parent6784becb0cecf1faf313ffb8da283acc416dc083
Merge branch 'collectd-5.4' into collectd-5.5
src/daemon/plugin.c
src/snmp.c