Merge pull request #2841 from elfiesmelfie/feat_mdevents

author Dagobert Michelsen <dam@opencsw.org>

Thu, 9 Apr 2020 14:30:49 +0000 (16:30 +0200)

committer GitHub <noreply@github.com>

Thu, 9 Apr 2020 14:30:49 +0000 (16:30 +0200)
author Dagobert Michelsen <dam@opencsw.org>
Thu, 9 Apr 2020 14:30:49 +0000 (16:30 +0200)
committer GitHub <noreply@github.com>
Thu, 9 Apr 2020 14:30:49 +0000 (16:30 +0200)
diff --cc Makefile.am
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	Dagobert Michelsen <dam@opencsw.org>
	Thu, 9 Apr 2020 14:30:49 +0000 (16:30 +0200)
committer	GitHub <noreply@github.com>
	Thu, 9 Apr 2020 14:30:49 +0000 (16:30 +0200)
		1	2
Makefile.am	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