fixed rebase conflicts
authorMaryam Tahhan <maryam.tahhan@intel.com>
Fri, 30 Sep 2016 10:58:03 +0000 (11:58 +0100)
committerKrzysztof Matczak <krzysztofx.matczak@intel.com>
Sun, 25 Dec 2016 20:23:40 +0000 (20:23 +0000)
commit4ebf1f93bbf273cb3833c333c101ee6b9aea6bc1
treee5afb393cfb82eefe9e4545315d1ae08f36380a4
parent8b5c3389fb07281ba9ac6859f50faa44184541d8
fixed rebase conflicts

Signed-off-by: Krzysztof Matczak <krzysztofx.matczak@intel.com>
Makefile.am
README
configure.ac
src/collectd.conf.in
src/collectd.conf.pod
src/mcelog.c [new file with mode: 0644]