Merge pull request #10832 from phonedph1/concurrent-idea

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

Wed, 13 Oct 2021 07:24:47 +0000 (09:24 +0200)

committer GitHub <noreply@github.com>

Wed, 13 Oct 2021 07:24:47 +0000 (09:24 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Wed, 13 Oct 2021 07:24:47 +0000 (09:24 +0200)
committer GitHub <noreply@github.com>
Wed, 13 Oct 2021 07:24:47 +0000 (09:24 +0200)
diff --cc pdns/dnsdist-console.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
diff --cc pdns/dnsdistdist/docs/rules-actions.rst
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Wed, 13 Oct 2021 07:24:47 +0000 (09:24 +0200)
committer	GitHub <noreply@github.com>
	Wed, 13 Oct 2021 07:24:47 +0000 (09:24 +0200)
		1	2
pdns/dnsdist-console.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/docs/rules-actions.rst	patch \|	diff1 \|	diff2 \|	blob \| history