tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3c424eb 96e0f23)

author	Florian Forster <octo@collectd.org>
	Mon, 18 Aug 2014 07:35:04 +0000 (09:35 +0200)
committer	Florian Forster <octo@collectd.org>
	Mon, 18 Aug 2014 07:35:04 +0000 (09:35 +0200)
commit	fd7673e5e9ad074624fc23cda5d2ec4549d43659
tree	62d538d34a0b53b8a81d19fdacd61cf722d26600	tree \| snapshot
parent	3c424eba3b919af518e4078bd5856f95d3a6ef47	commit \| diff
parent	96e0f2341bace029acefe0a88bab96ae326c0ff5	commit \| diff

Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
contrib/redhat/collectd.spec

configure.ac	diff1 \|	\|	blob \| history
contrib/redhat/collectd.spec	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	diff1 \|	diff2 \|	blob \| history
src/common.c	diff1 \|	diff2 \|	blob \| history
src/configfile.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/write_riemann.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)