Merge pull request #2923 from qdbp/gpu_nvml_plugin

author Florian Forster <ff@octo.it>

Sat, 27 Oct 2018 07:14:25 +0000 (09:14 +0200)

committer GitHub <noreply@github.com>

Sat, 27 Oct 2018 07:14:25 +0000 (09:14 +0200)
author Florian Forster <ff@octo.it>
Sat, 27 Oct 2018 07:14:25 +0000 (09:14 +0200)
committer GitHub <noreply@github.com>
Sat, 27 Oct 2018 07:14:25 +0000 (09:14 +0200)
diff --cc configure.ac
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Florian Forster <ff@octo.it>
	Sat, 27 Oct 2018 07:14:25 +0000 (09:14 +0200)
committer	GitHub <noreply@github.com>
	Sat, 27 Oct 2018 07:14:25 +0000 (09:14 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history