![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Fri, 7 Sep 2012 09:05:48 +0000 (11:05 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Fri, 7 Sep 2012 09:05:48 +0000 (11:05 +0200) | ||
| commit | b4c8f3f762d666742c774ab3b45815e5a416e5da | |
| tree | b3dd55edbf88ee25305de9d512a459abbdf8c7c9 | tree | snapshot |
| parent | c882e8a855a6803a498be2235560f8d0359edcb6 | commit | diff |
| parent | 77f03c91b3074b5abd3e602002b7fc7ce28ea612 | commit | diff |
Merge branch 'collectd-4.10' into collectd-5.0
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/collectd.c | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/common.c | diff1 | | diff2 | | blob | history |
| src/df.c | diff1 | | diff2 | | blob | history |
| src/memcachec.c | diff1 | | diff2 | | blob | history |
| src/netapp.c | diff1 | | diff2 | | blob | history |
| src/oracle.c | diff1 | | diff2 | | blob | history |
| src/rrdtool.c | diff1 | | diff2 | | blob | history |
| src/snmp.c | diff1 | | diff2 | | blob | history |
| src/utils_dns.c | diff1 | | diff2 | | blob | history |