Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 30 Nov 2015 21:58:29 +0000 (22:58 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 30 Nov 2015 21:58:29 +0000 (22:58 +0100)
commitf701e685eab83f37ecc6501d7dbe4eb941a454bb
tree406e56869c3ddfc6be2c2e560928d2c6dc6e63cd
parent688eabfd18b75ece2df552c7988caf3b374d45fd
parent032cea5c9a5335f497e3e5a5784672a5a4aa0d49
Merge branch 'collectd-5.4' into collectd-5.5
13 files changed:
configure.ac
src/Makefile.am
src/amqp.c
src/bind.c
src/cpu.c
src/csv.c
src/filecount.c
src/modbus.c
src/ntpd.c
src/powerdns.c
src/processes.c
src/snmp.c
src/write_graphite.c