Merge pull request #3388 from kwiatrox/multi_pmu_feat

author sranga4 <sunku.ranganath@intel.com>

Fri, 28 Feb 2020 23:38:57 +0000 (15:38 -0800)

committer GitHub <noreply@github.com>

Fri, 28 Feb 2020 23:38:57 +0000 (15:38 -0800)
author sranga4 <sunku.ranganath@intel.com>
Fri, 28 Feb 2020 23:38:57 +0000 (15:38 -0800)
committer GitHub <noreply@github.com>
Fri, 28 Feb 2020 23:38:57 +0000 (15:38 -0800)
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	sranga4 <sunku.ranganath@intel.com>
	Fri, 28 Feb 2020 23:38:57 +0000 (15:38 -0800)
committer	GitHub <noreply@github.com>
	Fri, 28 Feb 2020 23:38:57 +0000 (15:38 -0800)
		1	2
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history