![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Thu, 26 Nov 2015 13:22:20 +0000 (14:22 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Thu, 26 Nov 2015 13:22:20 +0000 (14:22 +0100) | ||
| commit | fc6f1e3d33d646391adb5cedc62e7b3904c15003 | |
| tree | 0b7633e995fc850f30131029dc17cfe5f072c23b | tree | snapshot |
| parent | 817e080279469498c446bff54dbc7e0633cb238c | commit | diff |
| parent | 007d96fe10beb6c6d4f20c79851404be18a3418f | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| src/apache.c | diff1 | | diff2 | | blob | history |
| src/daemon/common.c | diff1 | | | | blob | history |
| src/daemon/meta_data.c | diff1 | | | | blob | history |
| src/daemon/utils_avltree.c | diff1 | | | | blob | history |
| src/statsd.c | diff1 | | diff2 | | blob | history |