tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3b9261d df920b8)

author	Florian Forster <octo@collectd.org>
	Sat, 21 Jan 2012 12:07:50 +0000 (13:07 +0100)
committer	Florian Forster <octo@collectd.org>
	Sat, 21 Jan 2012 12:07:50 +0000 (13:07 +0100)
commit	488c2ca9e3f6f6082f192bdd5d737c6cd1298ba2
tree	3b6901de4affc07cc406dbb512ac224870093f0e	tree \| snapshot
parent	3b9261df9f7426c4b823a801671aaaba30fda6d9	commit \| diff
parent	df920b8327302ac74385d34dae671d988c752495	commit \| diff

Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
ChangeLog
src/df.c
src/plugin.h
version-gen.sh

Change-Id: Id7a31088cdb3371534d5c1e6a690464f3343543d

AUTHORS	diff1 \|	diff2 \|	blob \| history
ChangeLog	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	diff1 \|	diff2 \|	blob \| history
src/common.c	diff1 \|	diff2 \|	blob \| history
src/df.c	diff1 \|	diff2 \|	blob \| history
src/interface.c	diff1 \|	diff2 \|	blob \| history
src/network.c	diff1 \|	diff2 \|	blob \| history
src/plugin.c	diff1 \|	diff2 \|	blob \| history
src/plugin.h	diff1 \|	diff2 \|	blob \| history
src/pyvalues.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)