Merge pull request #3494 from lukeyeager/infiniband

author sranga4 <sunku.ranganath@intel.com>

Mon, 27 Jul 2020 17:11:25 +0000 (10:11 -0700)

committer GitHub <noreply@github.com>

Mon, 27 Jul 2020 17:11:25 +0000 (10:11 -0700)
author sranga4 <sunku.ranganath@intel.com>
Mon, 27 Jul 2020 17:11:25 +0000 (10:11 -0700)
committer GitHub <noreply@github.com>
Mon, 27 Jul 2020 17:11:25 +0000 (10:11 -0700)
diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/types.db
Simple merge
author	sranga4 <sunku.ranganath@intel.com>
	Mon, 27 Jul 2020 17:11:25 +0000 (10:11 -0700)
committer	GitHub <noreply@github.com>
	Mon, 27 Jul 2020 17:11:25 +0000 (10:11 -0700)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/types.db	patch \|	diff1 \|	diff2 \|	blob \| history