]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge pull request #3461 from collectd/collectd-5.10
authorkkepka <krzysztof.kepka@intel.com>
Thu, 28 May 2020 16:20:16 +0000 (18:20 +0200)
committerGitHub <noreply@github.com>
Thu, 28 May 2020 16:20:16 +0000 (18:20 +0200)
merge collectd 5.10 into collectd-5.11 branch

1  2 
src/zookeeper.c

diff --cc src/zookeeper.c
Simple merge