Code

Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@collectd.org>
Sun, 21 Aug 2011 14:43:22 +0000 (16:43 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 21 Aug 2011 14:43:22 +0000 (16:43 +0200)
commitba2ee9aec4c0454eed8f29b4c6ce96c6fc372346
tree4238418bb2f194b94f8c1423f40becd9088c1ebd
parentcf9ac771ade7c5ba75ab13d2b4f2482983994840
parentb96e6dd0fe5583ca809b66b2519e74081c79e4f3
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
src/apache.c
src/bind.c
src/csv.c
src/curl.c
src/curl_json.c
src/df.c
src/disk.c
src/java.c
src/libvirt.c
src/mysql.c
src/network.c
src/nginx.c
src/notify_email.c
src/processes.c
src/teamspeak2.c
src/utils_dns.c
src/write_http.c