![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Maryam Tahhan <maryam.tahhan@intel.com> | |
| Fri, 30 Sep 2016 10:58:03 +0000 (11:58 +0100) | ||
| committer | Krzysztof Matczak <krzysztofx.matczak@intel.com> | |
| Sun, 25 Dec 2016 20:23:40 +0000 (20:23 +0000) | ||
| commit | 4ebf1f93bbf273cb3833c333c101ee6b9aea6bc1 | |
| tree | e5afb393cfb82eefe9e4545315d1ae08f36380a4 | tree | snapshot |
| parent | 8b5c3389fb07281ba9ac6859f50faa44184541d8 | commit | diff |
fixed rebase conflicts
Signed-off-by: Krzysztof Matczak <krzysztofx.matczak@intel.com>
Signed-off-by: Krzysztof Matczak <krzysztofx.matczak@intel.com>
| Makefile.am | diff | blob | history | |
| README | diff | blob | history | |
| configure.ac | diff | blob | history | |
| src/collectd.conf.in | diff | blob | history | |
| src/collectd.conf.pod | diff | blob | history | |
| src/mcelog.c | [new file with mode: 0644] | blob |