tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 688eabf 032cea5)

author	Marc Fournier <marc.fournier@camptocamp.com>
	Mon, 30 Nov 2015 21:58:29 +0000 (22:58 +0100)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Mon, 30 Nov 2015 21:58:29 +0000 (22:58 +0100)
commit	f701e685eab83f37ecc6501d7dbe4eb941a454bb
tree	406e56869c3ddfc6be2c2e560928d2c6dc6e63cd	tree \| snapshot
parent	688eabfd18b75ece2df552c7988caf3b374d45fd	commit \| diff
parent	032cea5c9a5335f497e3e5a5784672a5a4aa0d49	commit \| diff

Merge branch 'collectd-5.4' into collectd-5.5

13 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/amqp.c	diff1 \|	diff2 \|	blob \| history
src/bind.c	diff1 \|	diff2 \|	blob \| history
src/cpu.c	diff1 \|	diff2 \|	blob \| history
src/csv.c	diff1 \|	diff2 \|	blob \| history
src/filecount.c	diff1 \|	diff2 \|	blob \| history
src/modbus.c	diff1 \|	diff2 \|	blob \| history
src/ntpd.c	diff1 \|	diff2 \|	blob \| history
src/powerdns.c	diff1 \|	diff2 \|	blob \| history
src/processes.c	diff1 \|	diff2 \|	blob \| history
src/snmp.c	diff1 \|	diff2 \|	blob \| history
src/write_graphite.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)