Merge pull request #3303 from asafkahlon/add-buddyinfo-plugin

author Kamil Wiatrowski <kamilx.wiatrowski@intel.com>

Fri, 21 Feb 2020 17:10:29 +0000 (18:10 +0100)

committer GitHub <noreply@github.com>

Fri, 21 Feb 2020 17:10:29 +0000 (18:10 +0100)
author Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
Fri, 21 Feb 2020 17:10:29 +0000 (18:10 +0100)
committer GitHub <noreply@github.com>
Fri, 21 Feb 2020 17:10:29 +0000 (18:10 +0100)
diff --cc Makefile.am
Simple merge
diff --cc README
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
	Fri, 21 Feb 2020 17:10:29 +0000 (18:10 +0100)
committer	GitHub <noreply@github.com>
	Fri, 21 Feb 2020 17:10:29 +0000 (18:10 +0100)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history