Merge pull request #3265 from n2yen/write-http-curl-stats

author Dagobert Michelsen <dam@opencsw.org>

Tue, 18 Feb 2020 15:13:35 +0000 (16:13 +0100)

committer GitHub <noreply@github.com>

Tue, 18 Feb 2020 15:13:35 +0000 (16:13 +0100)
author Dagobert Michelsen <dam@opencsw.org>
Tue, 18 Feb 2020 15:13:35 +0000 (16:13 +0100)
committer GitHub <noreply@github.com>
Tue, 18 Feb 2020 15:13:35 +0000 (16:13 +0100)
diff --cc Makefile.am
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Dagobert Michelsen <dam@opencsw.org>
	Tue, 18 Feb 2020 15:13:35 +0000 (16:13 +0100)
committer	GitHub <noreply@github.com>
	Tue, 18 Feb 2020 15:13:35 +0000 (16:13 +0100)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history