![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 20 Dec 2008 09:17:26 +0000 (10:17 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 20 Dec 2008 09:17:26 +0000 (10:17 +0100) | ||
| commit | 074b4980bc75bea6826e6a38dcc6e193a721b2a8 | |
| tree | 5f136359d2ebce6eba0ea91697f73199d194b332 | tree | snapshot |
| parent | 5d7d1a7ee2aec05639398e6d93e998ae418d0065 | commit | diff |
| parent | f5edd182195cb7a13fa32846ae869a8b8dcc1e3f | commit | diff |
Merge branch 'collectd-4.4' into collectd-4.5
Conflicts:
src/utils_dns.c
Conflicts:
src/utils_dns.c
| src/collectd.c | diff1 | | diff2 | | blob | history |
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/common.c | diff1 | | diff2 | | blob | history |
| src/email.c | diff1 | | diff2 | | blob | history |
| src/ipmi.c | diff1 | | diff2 | | blob | history |
| src/rrdtool.c | diff1 | | diff2 | | blob | history |
| src/unixsock.c | diff1 | | diff2 | | blob | history |
| src/utils_dns.c | diff1 | | diff2 | | blob | history |