Merge pull request #10907 from rgacogne/ddist-handle-existing-edns-mac-setedns

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

Mon, 15 Nov 2021 13:16:21 +0000 (14:16 +0100)

committer GitHub <noreply@github.com>

Mon, 15 Nov 2021 13:16:21 +0000 (14:16 +0100)
author Remi Gacogne <remi.gacogne@powerdns.com>
Mon, 15 Nov 2021 13:16:21 +0000 (14:16 +0100)
committer GitHub <noreply@github.com>
Mon, 15 Nov 2021 13:16:21 +0000 (14:16 +0100)
diff --cc pdns/dnsdistdist/docs/rules-actions.rst
Simple merge
diff --cc regression-tests.dnsdist/test_Advanced.py
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Mon, 15 Nov 2021 13:16:21 +0000 (14:16 +0100)
committer	GitHub <noreply@github.com>
	Mon, 15 Nov 2021 13:16:21 +0000 (14:16 +0100)
		1	2
pdns/dnsdistdist/docs/rules-actions.rst	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.dnsdist/test_Advanced.py	patch \|	diff1 \|	diff2 \|	blob \| history