Merge pull request #11174 from rgacogne/ddist-poolaction-continue

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

Tue, 1 Feb 2022 11:32:22 +0000 (12:32 +0100)

committer GitHub <noreply@github.com>

Tue, 1 Feb 2022 11:32:22 +0000 (12:32 +0100)
author Remi Gacogne <remi.gacogne@powerdns.com>
Tue, 1 Feb 2022 11:32:22 +0000 (12:32 +0100)
committer GitHub <noreply@github.com>
Tue, 1 Feb 2022 11:32:22 +0000 (12:32 +0100)
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdistdist/docs/rules-actions.rst
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Tue, 1 Feb 2022 11:32:22 +0000 (12:32 +0100)
committer	GitHub <noreply@github.com>
	Tue, 1 Feb 2022 11:32:22 +0000 (12:32 +0100)
		1	2
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/docs/rules-actions.rst	patch \|	diff1 \|	diff2 \|	blob \| history