![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Sat, 6 Aug 2016 18:33:54 +0000 (20:33 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Sat, 6 Aug 2016 18:33:54 +0000 (20:33 +0200) | ||
| commit | 3d7453f6c3a13dc49e9ed6dd6d7a19202a3b087e | |
| tree | cd84f7d4db51543dce59b553b398f36a9a539750 | tree | snapshot |
| parent | 7bfda8d327240ac73297e4449663814dd0594be5 | commit | diff |
| parent | 496ca2b758344bc6372ab0adf98ad8050f69b25a | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| src/libcollectdclient/client.c | diff1 | | diff2 | | blob | history |
| src/ping.c | diff1 | | diff2 | | blob | history |
| src/utils_db_query.c | diff1 | | diff2 | | blob | history |