![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Mon, 7 Nov 2016 07:52:38 +0000 (08:52 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Mon, 7 Nov 2016 07:52:38 +0000 (08:52 +0100) | ||
| commit | 41288c6a9ed050b41ad47184aa1b53668c3588cc | |
| tree | 09bfc143fec40be91e0feec552c732190ab4a148 | tree | snapshot |
| parent | c442c66d9e98852f1b8eaa1b816d6ee7f84d0342 | commit | diff |
| parent | 1326af38b3ef25c41c994cd76c043202636b3d70 | commit | diff |
Merge branch 'collectd-5.6'
| configure.ac | diff1 | | diff2 | | blob | history |
| src/apcups.c | diff1 | | diff2 | | blob | history |
| src/modbus.c | diff1 | | diff2 | | blob | history |
| src/write_kafka.c | diff1 | | diff2 | | blob | history |