![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Sun, 19 Feb 2017 12:07:39 +0000 (13:07 +0100) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Sun, 19 Feb 2017 12:07:39 +0000 (13:07 +0100) |
Conflicts:
contrib/redhat/collectd.spec
src/Makefile.am
src/dpdkstat.c
contrib/redhat/collectd.spec
src/Makefile.am
src/dpdkstat.c
| 1 | 2 | |||
|---|---|---|---|---|
| contrib/redhat/collectd.spec | patch | | diff1 | | diff2 | | blob | history |
| src/daemon/plugin.c | patch | | diff1 | | diff2 | | blob | history |
| src/intel_rdt.c | patch | | diff1 | | diff2 | | blob | history |
| src/mqtt.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc contrib/redhat/collectd.spec
index 350c35790e8f44fb1defe6ac6a5a95dbcea83fa2,d6ca90e7d103cfb0434741d6ae72af4c7f599026..faf7ced73b3253ea9039a32a4d37d431529066a1
%doc contrib/
%changelog
+ * Tue Jan 01 2017 Marc Fournier <marc.fournier@camptocamp.com> - 5.7.1-1
+ - New upstream version
+
+* Sat Dec 31 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.7.0-4
+- Add new ovs_events plugin
+
+* Sat Dec 31 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.7.0-3
+- Add new mcelog plugin
+
* Tue Nov 29 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.7.0-2
- Disable redis plugin on RHEL 6, hiredis has been retired from EPEL6
diff --cc src/daemon/plugin.c
Simple merge
diff --cc src/intel_rdt.c
Simple merge
diff --cc src/mqtt.c
Simple merge