Code

Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 19 Feb 2017 12:07:39 +0000 (13:07 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 19 Feb 2017 12:07:39 +0000 (13:07 +0100)
commit446138394bb95c49d0e05ea440fbf63aefe84bab
tree3c4b0342a9a020807a717eeaf8cc44ea9412fcf4
parent4138e6c7622acf45d8e441a2d5085190b832c439
parentf7e2d82c4d016df72c55e85bb9c5bc9ba08d5f91
Merge branch 'collectd-5.7'

Conflicts:
contrib/redhat/collectd.spec
src/Makefile.am
src/dpdkstat.c
contrib/redhat/collectd.spec
src/daemon/plugin.c
src/intel_rdt.c
src/mqtt.c