tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cf9ac77 b96e6dd)

author	Florian Forster <octo@collectd.org>
	Sun, 21 Aug 2011 14:43:22 +0000 (16:43 +0200)
committer	Florian Forster <octo@collectd.org>
	Sun, 21 Aug 2011 14:43:22 +0000 (16:43 +0200)
commit	ba2ee9aec4c0454eed8f29b4c6ce96c6fc372346
tree	4238418bb2f194b94f8c1423f40becd9088c1ebd	tree \| snapshot
parent	cf9ac771ade7c5ba75ab13d2b4f2482983994840	commit \| diff
parent	b96e6dd0fe5583ca809b66b2519e74081c79e4f3	commit \| diff

Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
src/curl_json.c
src/libvirt.c

Change-Id: I0852495b416435fa3cfd36068d967e0cd5ff689f

18 files changed:

configure.in	diff1 \|	diff2 \|	blob \| history
src/apache.c	diff1 \|	diff2 \|	blob \| history
src/bind.c	diff1 \|	diff2 \|	blob \| history
src/csv.c	diff1 \|	diff2 \|	blob \| history
src/curl.c	diff1 \|	diff2 \|	blob \| history
src/curl_json.c	diff1 \|	diff2 \|	blob \| history
src/df.c	diff1 \|	diff2 \|	blob \| history
src/disk.c	diff1 \|	diff2 \|	blob \| history
src/java.c	diff1 \|	diff2 \|	blob \| history
src/libvirt.c	diff1 \|	diff2 \|	blob \| history
src/mysql.c	diff1 \|	diff2 \|	blob \| history
src/network.c	diff1 \|	diff2 \|	blob \| history
src/nginx.c	diff1 \|	diff2 \|	blob \| history
src/notify_email.c	diff1 \|	diff2 \|	blob \| history
src/processes.c	diff1 \|	diff2 \|	blob \| history
src/teamspeak2.c	diff1 \|	diff2 \|	blob \| history
src/utils_dns.c	diff1 \|	diff2 \|	blob \| history
src/write_http.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)