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

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

6dee24f766473beda5e7096251d32f1053136ff4