tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 154cdd9 4d04d3b)

author	Florian Forster <octo@collectd.org>
	Sat, 5 Dec 2015 21:06:35 +0000 (22:06 +0100)
committer	Florian Forster <octo@collectd.org>
	Sat, 5 Dec 2015 21:06:35 +0000 (22:06 +0100)
commit	791e99923dbbf045b11fbd7b0ea8df647e29593e
tree	cacb9d28f76f33efd66bdad7cd3346d094f19194	tree \| snapshot
parent	154cdd973167f1c9b5aab33875fe47af6a0964a6	commit \| diff
parent	4d04d3b7e32b8777f7c7b04110b74194b991fbea	commit \| diff

Merge branch 'collectd-5.4' into collectd-5.5

configure.ac	diff1 \|	diff2 \|	blob \| history
src/bind.c	diff1 \|	diff2 \|	blob \| history
src/curl_xml.c	diff1 \|	diff2 \|	blob \| history
src/daemon/utils_cache.c	diff1 \|	\|	blob \| history
src/libcollectdclient/client.c	diff1 \|	diff2 \|	blob \| history
src/statsd.c	diff1 \|	diff2 \|	blob \| history
src/unixsock.c	diff1 \|	diff2 \|	blob \| history
src/varnish.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)