tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: efb97f7 f1ba273)

author	Florian Forster <octo@collectd.org>
	Sun, 1 Apr 2012 10:07:20 +0000 (12:07 +0200)
committer	Florian Forster <octo@collectd.org>
	Sun, 1 Apr 2012 10:07:20 +0000 (12:07 +0200)
commit	ab55c79a0fee35932995d9f492730dc131034d52
tree	e7babe5f494de86039454c19c955f15aec0a9e4f	tree \| snapshot
parent	efb97f730c570686269cc9b7545842162ff6af71	commit \| diff
parent	f1ba2733d2c58fed90c13e9ae31cb7c1f3c5613e	commit \| diff

Merge branch 'collectd-5.0'

ChangeLog	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	diff1 \|	diff2 \|	blob \| history
src/libcollectdclient/client.c	diff1 \|	diff2 \|	blob \| history
src/processes.c	diff1 \|	diff2 \|	blob \| history
src/snmp.c	diff1 \|	diff2 \|	blob \| history
src/tcpconns.c	diff1 \|	diff2 \|	blob \| history
version-gen.sh	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)