Merge pull request #2926 from elfiesmelfie/feat_redfish

author Dagobert Michelsen <dam@opencsw.org>

Fri, 28 Feb 2020 09:34:42 +0000 (10:34 +0100)

committer GitHub <noreply@github.com>

Fri, 28 Feb 2020 09:34:42 +0000 (10:34 +0100)
author Dagobert Michelsen <dam@opencsw.org>
Fri, 28 Feb 2020 09:34:42 +0000 (10:34 +0100)
committer GitHub <noreply@github.com>
Fri, 28 Feb 2020 09:34:42 +0000 (10:34 +0100)
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>
	Fri, 28 Feb 2020 09:34:42 +0000 (10:34 +0100)
committer	GitHub <noreply@github.com>
	Fri, 28 Feb 2020 09:34:42 +0000 (10:34 +0100)
		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