]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
projects / thirdparty / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d39081b 3182574)
Merge branch 'collectd-5.11' into merge-511-512 3552/head
authorFlorian Forster <octo@google.com>
Mon, 31 Aug 2020 14:07:15 +0000 (16:07 +0200)
committerFlorian Forster <octo@google.com>
Mon, 31 Aug 2020 14:07:15 +0000 (16:07 +0200)
1  2 
src/zookeeper.c patch | diff1 | diff2 | blob | history

diff --cc src/zookeeper.c
Simple merge
Mirror of https://github.com/collectd/collectd.git