![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Thu, 11 Jun 2015 06:50:12 +0000 (07:50 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Thu, 11 Jun 2015 06:50:12 +0000 (07:50 +0100) | ||
| commit | cedb6f147e94d0e952449f731313412ef4d67904 | |
| tree | 3e1a4d9c1b6203febc8084c5cf1d79bcd65dc287 | tree | snapshot |
| parent | b545dbd106a9a3c713041934aaa818a17cb1db10 | commit | diff |
| parent | 21ba59f8197dba0a72dbf5186bc0a5d7e5074496 | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| configure.ac | diff1 | | diff2 | | blob | history |
| src/daemon/configfile.c | diff1 | | | | blob | history |
| src/statsd.c | diff1 | | diff2 | | blob | history |
| src/tcpconns.c | diff1 | | diff2 | | blob | history |
| src/utils_dns.c | diff1 | | diff2 | | blob | history |
| src/vmem.c | diff1 | | diff2 | | blob | history |