Merge pull request #7015 from rgacogne/dnsdist-protobuf-serverid

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Fri, 5 Oct 2018 16:00:54 +0000 (18:00 +0200)

committer GitHub <noreply@github.com>

Fri, 5 Oct 2018 16:00:54 +0000 (18:00 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Fri, 5 Oct 2018 16:00:54 +0000 (18:00 +0200)
committer GitHub <noreply@github.com>
Fri, 5 Oct 2018 16:00:54 +0000 (18:00 +0200)
diff --cc pdns/dnsdist-console.cc
Simple merge
diff --cc pdns/dnsdist-lua-actions.cc
Simple merge
diff --cc pdns/dnsdist-lua-bindings.cc
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Fri, 5 Oct 2018 16:00:54 +0000 (18:00 +0200)
committer	GitHub <noreply@github.com>
	Fri, 5 Oct 2018 16:00:54 +0000 (18:00 +0200)
		1	2
pdns/dnsdist-console.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua-actions.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua-bindings.cc	patch \|	diff1 \|	diff2 \|	blob \| history