tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b35ef46 bf4061d)

author	Marc Fournier <marc.fournier@camptocamp.com>
	Tue, 12 Jan 2016 08:03:09 +0000 (09:03 +0100)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Tue, 12 Jan 2016 08:03:09 +0000 (09:03 +0100)
commit	40e77dd34f9a8466165a8b7d724faeb337c90414
tree	f50b07ecc90c2b27065561ce3f42a4e563369059	tree \| snapshot
parent	b35ef467c9c197dc481aaca9faeea703e60f379a	commit \| diff
parent	bf4061d7f280863130619559c95badce90fb8444	commit \| diff

Merge branch 'collectd-5.4' into collectd-5.5

src/collectd.conf.in	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	diff1 \|	diff2 \|	blob \| history
src/curl_json.c	diff1 \|	diff2 \|	blob \| history
src/email.c	diff1 \|	diff2 \|	blob \| history
src/libcollectdclient/network.c	diff1 \|	diff2 \|	blob \| history
src/openvpn.c	diff1 \|	diff2 \|	blob \| history
src/perl.c	diff1 \|	diff2 \|	blob \| history
src/snmp.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)