tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 936c450 79963d1)

author	Florian Forster <octo@collectd.org>
	Mon, 28 Nov 2016 21:16:04 +0000 (22:16 +0100)
committer	Florian Forster <octo@collectd.org>
	Mon, 28 Nov 2016 21:16:04 +0000 (22:16 +0100)
commit	facbb03bdd0c591344b1a81dd0437064cfcc24e5
tree	af650c9f68c25de7050ae854a8b6c4b339d001b5	tree \| snapshot
parent	936c450a86c841eea89888c8550c9118fae90c25	commit \| diff
parent	79963d13c1884d1d92667cc502ad20758b084a12	commit \| diff

Merge branch 'collectd-5.6'

15 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
src/barometer.c	diff1 \|	diff2 \|	blob \| history
src/utils_cmd_flush.h	diff1 \|	diff2 \|	blob \| history
src/utils_cmd_getthreshold.c	diff1 \|	diff2 \|	blob \| history
src/utils_cmd_getval.c	diff1 \|	diff2 \|	blob \| history
src/utils_cmd_getval.h	diff1 \|	diff2 \|	blob \| history
src/utils_cmd_listval.c	diff1 \|	diff2 \|	blob \| history
src/utils_cmd_listval.h	diff1 \|	diff2 \|	blob \| history
src/utils_cmd_putval.c	diff1 \|	diff2 \|	blob \| history
src/utils_cmd_putval.h	diff1 \|	diff2 \|	blob \| history
src/utils_format_graphite.c	diff1 \|	diff2 \|	blob \| history
src/utils_format_graphite.h	diff1 \|	diff2 \|	blob \| history
src/utils_latency.c	diff1 \|	diff2 \|	blob \| history
src/utils_latency.h	diff1 \|	diff2 \|	blob \| history
src/utils_latency_test.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)