tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a35e7bb 9c962b9)

author	Marc Fournier <marc.fournier@camptocamp.com>
	Mon, 10 Oct 2016 19:04:03 +0000 (21:04 +0200)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Mon, 10 Oct 2016 19:04:03 +0000 (21:04 +0200)
commit	8c5927c52f4eefebaad3a6ecadc253ee9007ebb5
tree	136d7dadf365be5b1577b21f859dea414d462548	tree \| snapshot
parent	a35e7bb5ee1004f9631a9c4b9569b2cc00016ae5	commit \| diff
parent	9c962b99a3acd77f1d6e2499052b47356819511a	commit \| diff

Merge branch 'collectd-5.6'

contrib/redhat/collectd.spec	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	diff1 \|	diff2 \|	blob \| history
src/daemon/common.c	diff1 \|	diff2 \|	blob \| history
src/lua.c	diff1 \|	diff2 \|	blob \| history
src/rrdcached.c	diff1 \|	diff2 \|	blob \| history
src/tail_csv.c	diff1 \|	diff2 \|	blob \| history
src/vserver.c	diff1 \|	diff2 \|	blob \| history
src/write_redis.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)