![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Wed, 12 Jul 2017 16:59:07 +0000 (18:59 +0200) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Wed, 12 Jul 2017 16:59:07 +0000 (18:59 +0200) | ||
| commit | 267bbc64779f9c7b32e063aac0df22be61bda6ae | |
| tree | 1571fc915d6dbaeb86c91644ea56c93b5d6d2212 | tree | snapshot |
| parent | bea5daaed7b5cf9160207a95292947873fdcf927 | commit | diff |
| parent | 01761867ced7bc5fe71546baf350be4a3e800600 | commit | diff |
Merge branch 'collectd-5.7'
Conflicts:
contrib/systemd.collectd.service
Conflicts:
contrib/systemd.collectd.service
| contrib/systemd.collectd.service | diff1 | | diff2 | | blob | history |
| src/ipc.c | diff1 | | diff2 | | blob | history |