From: Matthias Runge <mrunge@redhat.com>
Date: Mon, 15 Feb 2021 15:22:27 +0000 (+0100)
Subject: Merge branch 'collectd-6.0' into mlsr/collectd6-buddyinfo
X-Git-Tag: 6.0.0-rc0~135^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3833%2Fhead;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-6.0' into mlsr/collectd6-buddyinfo
---

4b2789d3cc9674b8642e93a7c760cb16a73e4660