tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 160fb49 383173f)

author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Tue, 1 Mar 2016 11:47:25 +0000 (12:47 +0100)
committer	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Tue, 1 Mar 2016 11:47:25 +0000 (12:47 +0100)
commit	b24fe01f603e1422de29c2cf090eabb043df1965
tree	d8ce326be7bd9986144bf5406469ec69b11ca967	tree \| snapshot
parent	160fb4929496d00c3190be9e2c01bc16062cabf0	commit \| diff
parent	383173f48def3adc882710b6ceeacd87c7b635c6	commit \| diff

Merge branch 'collectd-5.5'

src/barometer.c	diff1 \|	diff2 \|	blob \| history
src/daemon/collectd.c	diff1 \|	diff2 \|	blob \| history
src/daemon/plugin.h	diff1 \|	diff2 \|	blob \| history
src/daemon/utils_cache.c	diff1 \|	diff2 \|	blob \| history
src/redis.c	diff1 \|	diff2 \|	blob \| history
src/write_riemann.c	diff1 \|	diff2 \|	blob \| history
src/write_riemann_threshold.c	diff1 \|	diff2 \|	blob \| history
src/write_sensu.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)