Merge pull request #2470 from dothebart/curl_jolokia_2

author Florian Forster <octo@collectd.org>

Mon, 17 Aug 2020 15:27:50 +0000 (17:27 +0200)

committer GitHub <noreply@github.com>

Mon, 17 Aug 2020 15:27:50 +0000 (17:27 +0200)
author Florian Forster <octo@collectd.org>
Mon, 17 Aug 2020 15:27:50 +0000 (17:27 +0200)
committer GitHub <noreply@github.com>
Mon, 17 Aug 2020 15:27:50 +0000 (17:27 +0200)
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Florian Forster <octo@collectd.org>
	Mon, 17 Aug 2020 15:27:50 +0000 (17:27 +0200)
committer	GitHub <noreply@github.com>
	Mon, 17 Aug 2020 15:27:50 +0000 (17:27 +0200)
		1	2
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history