Merge pull request #3264 from rdietric/gpu-index

author Dagobert Michelsen <dam@opencsw.org>

Tue, 3 Mar 2020 09:23:24 +0000 (10:23 +0100)

committer GitHub <noreply@github.com>

Tue, 3 Mar 2020 09:23:24 +0000 (10:23 +0100)
author Dagobert Michelsen <dam@opencsw.org>
Tue, 3 Mar 2020 09:23:24 +0000 (10:23 +0100)
committer GitHub <noreply@github.com>
Tue, 3 Mar 2020 09:23:24 +0000 (10:23 +0100)
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Dagobert Michelsen <dam@opencsw.org>
	Tue, 3 Mar 2020 09:23:24 +0000 (10:23 +0100)
committer	GitHub <noreply@github.com>
	Tue, 3 Mar 2020 09:23:24 +0000 (10:23 +0100)
		1	2
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history