tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0003c4d a7850b8)

author	Florian Forster <octo@collectd.org>
	Fri, 19 Jun 2015 13:11:39 +0000 (15:11 +0200)
committer	Florian Forster <octo@collectd.org>
	Fri, 19 Jun 2015 13:11:39 +0000 (15:11 +0200)
commit	81a5fd5046c6a39f580a8fc1a3af837fd5f5aa5c
tree	903ec431077656b1f7977d5cf4e1d4207969aaab	tree \| snapshot
parent	0003c4d3c184f0f437499d6073cd023dc7b659c2	commit \| diff
parent	a7850b871becb5121794a7fc6c1f7242588ee33f	commit \| diff

Merge branch 'collectd-5.4' into collectd-5.5

17 files changed:

src/apache.c	diff1 \|	diff2 \|	blob \| history
src/collectdmon.c	diff1 \|	diff2 \|	blob \| history
src/curl.c	diff1 \|	diff2 \|	blob \| history
src/curl_json.c	diff1 \|	diff2 \|	blob \| history
src/curl_xml.c	diff1 \|	diff2 \|	blob \| history
src/daemon/utils_cache.c	diff1 \|	\|	blob \| history
src/gmond.c	diff1 \|	diff2 \|	blob \| history
src/java.c	diff1 \|	diff2 \|	blob \| history
src/memcachec.c	diff1 \|	diff2 \|	blob \| history
src/powerdns.c	diff1 \|	diff2 \|	blob \| history
src/snmp.c	diff1 \|	diff2 \|	blob \| history
src/threshold.c	diff1 \|	diff2 \|	blob \| history
src/utils_cmd_flush.c	diff1 \|	diff2 \|	blob \| history
src/utils_cmd_putval.c	diff1 \|	diff2 \|	blob \| history
src/utils_ignorelist.c	diff1 \|	diff2 \|	blob \| history
src/utils_latency.c	diff1 \|	diff2 \|	blob \| history
src/utils_rrdcreate.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)