]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge branches 'v6/interface' and 'v6/memory' into collectd-6.0 3561/head
authorFlorian Forster <octo@google.com>
Mon, 19 Oct 2020 08:56:08 +0000 (10:56 +0200)
committerFlorian Forster <octo@google.com>
Mon, 19 Oct 2020 08:56:08 +0000 (10:56 +0200)

Trivial merge