Merge pull request #12415 from rgacogne/ddist-improv

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

Tue, 17 Jan 2023 11:31:33 +0000 (12:31 +0100)

committer GitHub <noreply@github.com>

Tue, 17 Jan 2023 11:31:33 +0000 (12:31 +0100)
author Remi Gacogne <remi.gacogne@powerdns.com>
Tue, 17 Jan 2023 11:31:33 +0000 (12:31 +0100)
committer GitHub <noreply@github.com>
Tue, 17 Jan 2023 11:31:33 +0000 (12:31 +0100)
diff --cc pdns/dnsdist-lua-actions.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Tue, 17 Jan 2023 11:31:33 +0000 (12:31 +0100)
committer	GitHub <noreply@github.com>
	Tue, 17 Jan 2023 11:31:33 +0000 (12:31 +0100)
		1	2
pdns/dnsdist-lua-actions.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history