Merge branch 'collectd-5.7' into collectd-5.8
authorPavel Rochnyack <pavel2000@ngs.ru>
Fri, 30 Mar 2018 14:12:47 +0000 (21:12 +0700)
committerPavel Rochnyack <pavel2000@ngs.ru>
Fri, 30 Mar 2018 14:12:47 +0000 (21:12 +0700)
1  2 
docs/BUILD.dpdkstat.md
src/perl.c
src/write_kafka.c
src/write_prometheus.c

Simple merge
diff --cc src/perl.c
Simple merge
Simple merge
Simple merge