Merge pull request #8372 from rgacogne/ddist-vrf-itf

author Remi Gacogne <rgacogne@users.noreply.github.com>

Sat, 12 Oct 2019 13:25:17 +0000 (15:25 +0200)

committer GitHub <noreply@github.com>

Sat, 12 Oct 2019 13:25:17 +0000 (15:25 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Sat, 12 Oct 2019 13:25:17 +0000 (15:25 +0200)
committer GitHub <noreply@github.com>
Sat, 12 Oct 2019 13:25:17 +0000 (15:25 +0200)
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist-tcp.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Sat, 12 Oct 2019 13:25:17 +0000 (15:25 +0200)
committer	GitHub <noreply@github.com>
	Sat, 12 Oct 2019 13:25:17 +0000 (15:25 +0200)
		1	2
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-tcp.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history