![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Mon, 7 Nov 2016 07:43:17 +0000 (08:43 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Mon, 7 Nov 2016 07:48:45 +0000 (08:48 +0100) | ||
| commit | 1326af38b3ef25c41c994cd76c043202636b3d70 | |
| tree | aa78ad116470823c894d92574e8aa585871cdfae | tree | snapshot |
| parent | 4979d8dcd6f097eb8fd4661086e28accd31ff905 | commit | diff |
| parent | 68d6aff96c029c9a455b7a0146c788af08f9ff22 | commit | diff |
Merge branch 'collectd-5.5' into 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 |
| src/write_riemann.c | diff1 | | diff2 | | blob | history |
| src/write_riemann_threshold.c | diff1 | | diff2 | | blob | history |