tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fe3ed44 d09ec85)

author	Florian Forster <octo@collectd.org>
	Thu, 18 Jun 2015 11:05:14 +0000 (13:05 +0200)
committer	Florian Forster <octo@collectd.org>
	Thu, 18 Jun 2015 11:05:14 +0000 (13:05 +0200)
commit	09c6a320f3cb36b5dbb2c2ce43858f33be7acf9b
tree	248df40bc42615a06eadd5900e91ea24cebe14e6	tree \| snapshot
parent	fe3ed442ad6f9dfc583c91ab97f912f9ca44aee3	commit \| diff
parent	d09ec85d1584a7a0649a240b78f1390ff1296814	commit \| diff

Merge branch 'collectd-5.4' into collectd-5.5

17 files changed:

src/amqp.c	diff1 \|	diff2 \|	blob \| history
src/curl_json.c	diff1 \|	diff2 \|	blob \| history
src/daemon/filter_chain.c	diff1 \|	\|	blob \| history
src/daemon/utils_avltree.c	diff1 \|	\|	blob \| history
src/email.c	diff1 \|	diff2 \|	blob \| history
src/exec.c	diff1 \|	diff2 \|	blob \| history
src/gmond.c	diff1 \|	diff2 \|	blob \| history
src/libcollectdclient/client.c	diff1 \|	diff2 \|	blob \| history
src/modbus.c	diff1 \|	diff2 \|	blob \| history
src/network.c	diff1 \|	diff2 \|	blob \| history
src/ntpd.c	diff1 \|	diff2 \|	blob \| history
src/openvpn.c	diff1 \|	diff2 \|	blob \| history
src/ping.c	diff1 \|	diff2 \|	blob \| history
src/powerdns.c	diff1 \|	diff2 \|	blob \| history
src/snmp.c	diff1 \|	diff2 \|	blob \| history
src/tail.c	diff1 \|	diff2 \|	blob \| history
src/threshold.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)