tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6d13532 8d913d3)

author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Tue, 1 Mar 2016 10:26:25 +0000 (11:26 +0100)
committer	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Tue, 1 Mar 2016 10:26:25 +0000 (11:26 +0100)
commit	6a68a39a2c6987fdcc94fb1bdd9cc8f598fd9478
tree	6c55fe32d2f94fc48a1b5282c193daee25bdd4ac	tree \| snapshot
parent	6d13532642c934667697842e4ff021e070ddf34d	commit \| diff
parent	8d913d388c069a43ca92683b60c86607630ee9bd	commit \| diff

Merge branch 'collectd-5.4' into collectd-5.5

16 files changed:

src/daemon/plugin.h	diff1 \|	\|	blob \| history
src/daemon/types_list.c	diff1 \|	\|	blob \| history
src/daemon/utils_random.c	diff1 \|	\|	blob \| history
src/daemon/utils_subst.c	diff1 \|	\|	blob \| history
src/liboconfig/oconfig.c	diff1 \|	diff2 \|	blob \| history
src/processes.c	diff1 \|	diff2 \|	blob \| history
src/sensors.c	diff1 \|	diff2 \|	blob \| history
src/threshold.c	diff1 \|	diff2 \|	blob \| history
src/utils_cmd_flush.c	diff1 \|	diff2 \|	blob \| history
src/utils_cmd_getval.c	diff1 \|	diff2 \|	blob \| history
src/utils_cmd_putnotif.c	diff1 \|	diff2 \|	blob \| history
src/utils_cmd_putval.c	diff1 \|	diff2 \|	blob \| history
src/utils_db_query.c	diff1 \|	diff2 \|	blob \| history
src/utils_latency.c	diff1 \|	diff2 \|	blob \| history
src/utils_latency.h	diff1 \|	diff2 \|	blob \| history
src/xmms.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)