Merge branch 'collectd-5.7' into collectd-5.8
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 19 Feb 2018 15:14:01 +0000 (16:14 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 19 Feb 2018 15:14:01 +0000 (16:14 +0100)
commit1159cb5d383c55a80a0db100b8f7aadcf44740a5
tree7e5fad568c0a0a49f7575494fa9f130bc40a189e
parenta68a482c6ea1900e4f758019117a6856737ff34d
parentad0a12907bf80b4f0deec217b8379dd08c490dbc
Merge branch 'collectd-5.7' into collectd-5.8
docs/BUILD.dpdkstat.md
src/write_kafka.c
src/write_prometheus.c