![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Thu, 8 Dec 2016 14:27:03 +0000 (15:27 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Thu, 8 Dec 2016 14:27:03 +0000 (15:27 +0100) | ||
| commit | 3fb6fe5776c14f41879249f4147c0b8924b39cc1 | |
| tree | 6804fea55a73040479e9ac312469bb97336bee91 | tree | snapshot |
| parent | b8b1e35f503af693b8c53ddd32ffd41981a82dd5 | commit | diff |
| parent | bb1d857383b85dbc2c37098391d53e2b9261c830 | commit | diff |
Merge branch 'collectd-5.6' into collectd-5.7
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/smart.c | diff1 | | diff2 | | blob | history |
| src/write_kafka.c | diff1 | | diff2 | | blob | history |