Merge pull request #2776 from mfournier/unblock_pr_2737

author Marc Fournier <marc.fournier@camptocamp.com>

Tue, 15 May 2018 13:37:45 +0000 (14:37 +0100)

committer GitHub <noreply@github.com>

Tue, 15 May 2018 13:37:45 +0000 (14:37 +0100)
author Marc Fournier <marc.fournier@camptocamp.com>
Tue, 15 May 2018 13:37:45 +0000 (14:37 +0100)
committer GitHub <noreply@github.com>
Tue, 15 May 2018 13:37:45 +0000 (14:37 +0100)
diff --cc docs/BUILD.dpdkstat.md
Simple merge
diff --cc src/perl.c
Simple merge
diff --cc src/write_kafka.c
Simple merge
diff --cc src/write_prometheus.c
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Tue, 15 May 2018 13:37:45 +0000 (14:37 +0100)
committer	GitHub <noreply@github.com>
	Tue, 15 May 2018 13:37:45 +0000 (14:37 +0100)
		1	2
docs/BUILD.dpdkstat.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/perl.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/write_kafka.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/write_prometheus.c	patch \|	diff1 \|	diff2 \|	blob \| history