tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 225e6f9 9b7dee8)

author	Florian Forster <octo@collectd.org>
	Sat, 5 Dec 2015 07:57:07 +0000 (08:57 +0100)
committer	Florian Forster <octo@collectd.org>
	Sat, 5 Dec 2015 07:57:07 +0000 (08:57 +0100)
commit	8dfaf98cde62e42d4c245400c68ae9c825a2fe68
tree	7bb078829a5d642c8e8c30195a9b2b55657cf3b1	tree \| snapshot
parent	225e6f9d962bcf50451d0cdcb56950fc97c90007	commit \| diff
parent	9b7dee8838f56233cea2854a7ddbcad2790609ce	commit \| diff

Merge branch 'collectd-5.5'

19 files changed:

src/ceph.c	diff1 \|	diff2 \|	blob \| history
src/ceph_test.c	diff1 \|	diff2 \|	blob \| history
src/cpu.c	diff1 \|	diff2 \|	blob \| history
src/daemon/collectd.c	diff1 \|	diff2 \|	blob \| history
src/daemon/configfile.c	diff1 \|	diff2 \|	blob \| history
src/memcached.c	diff1 \|	diff2 \|	blob \| history
src/ntpd.c	diff1 \|	diff2 \|	blob \| history
src/perl.c	diff1 \|	diff2 \|	blob \| history
src/pinba.c	diff1 \|	diff2 \|	blob \| history
src/postgresql.c	diff1 \|	diff2 \|	blob \| history
src/processes.c	diff1 \|	diff2 \|	blob \| history
src/rrdtool.c	diff1 \|	diff2 \|	blob \| history
src/snmp.c	diff1 \|	diff2 \|	blob \| history
src/table.c	diff1 \|	diff2 \|	blob \| history
src/teamspeak2.c	diff1 \|	diff2 \|	blob \| history
src/threshold.c	diff1 \|	diff2 \|	blob \| history
src/varnish.c	diff1 \|	diff2 \|	blob \| history
src/write_graphite.c	diff1 \|	diff2 \|	blob \| history
src/zfs_arc.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)