Merge pull request #2796 from elfiesmelfie/feat_ipmi_SEL_ignore_list

author Pavel Rochnyak <pavel2000@ngs.ru>

Wed, 30 May 2018 12:59:32 +0000 (19:59 +0700)

committer GitHub <noreply@github.com>

Wed, 30 May 2018 12:59:32 +0000 (19:59 +0700)
author Pavel Rochnyak <pavel2000@ngs.ru>
Wed, 30 May 2018 12:59:32 +0000 (19:59 +0700)
committer GitHub <noreply@github.com>
Wed, 30 May 2018 12:59:32 +0000 (19:59 +0700)
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/ipmi.c
Simple merge
author	Pavel Rochnyak <pavel2000@ngs.ru>
	Wed, 30 May 2018 12:59:32 +0000 (19:59 +0700)
committer	GitHub <noreply@github.com>
	Wed, 30 May 2018 12:59:32 +0000 (19:59 +0700)
		1	2
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/ipmi.c	patch \|	diff1 \|	diff2 \|	blob \| history