Merge pull request #8115 from rgacogne/dnsdist-ecs-before-tsig

author Remi Gacogne <remi.gacogne@powerdns.com>

Fri, 7 Feb 2020 10:09:29 +0000 (11:09 +0100)

committer GitHub <noreply@github.com>

Fri, 7 Feb 2020 10:09:29 +0000 (11:09 +0100)
author Remi Gacogne <remi.gacogne@powerdns.com>
Fri, 7 Feb 2020 10:09:29 +0000 (11:09 +0100)
committer GitHub <noreply@github.com>
Fri, 7 Feb 2020 10:09:29 +0000 (11:09 +0100)
diff --cc pdns/dnsdist-lua-actions.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc regression-tests.dnsdist/dnsdisttests.py
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Fri, 7 Feb 2020 10:09:29 +0000 (11:09 +0100)
committer	GitHub <noreply@github.com>
	Fri, 7 Feb 2020 10:09:29 +0000 (11:09 +0100)
		1	2
pdns/dnsdist-lua-actions.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.dnsdist/dnsdisttests.py	patch \|	diff1 \|	diff2 \|	blob \| history