Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@collectd.org>
Fri, 7 Sep 2012 09:05:48 +0000 (11:05 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 7 Sep 2012 09:05:48 +0000 (11:05 +0200)
commitb4c8f3f762d666742c774ab3b45815e5a416e5da
treeb3dd55edbf88ee25305de9d512a459abbdf8c7c9
parentc882e8a855a6803a498be2235560f8d0359edcb6
parent77f03c91b3074b5abd3e602002b7fc7ce28ea612
Merge branch 'collectd-4.10' into collectd-5.0
src/Makefile.am
src/collectd.c
src/collectd.conf.pod
src/common.c
src/df.c
src/memcachec.c
src/netapp.c
src/oracle.c
src/rrdtool.c
src/snmp.c
src/utils_dns.c