Merge pull request #11006 from rgacogne/ddist-show-web-config

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

Wed, 24 Nov 2021 14:58:40 +0000 (15:58 +0100)

committer GitHub <noreply@github.com>

Wed, 24 Nov 2021 14:58:40 +0000 (15:58 +0100)
author Remi Gacogne <remi.gacogne@powerdns.com>
Wed, 24 Nov 2021 14:58:40 +0000 (15:58 +0100)
committer GitHub <noreply@github.com>
Wed, 24 Nov 2021 14:58:40 +0000 (15:58 +0100)
diff --cc pdns/dnsdist-console.cc
Simple merge
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdistdist/docs/reference/config.rst
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Wed, 24 Nov 2021 14:58:40 +0000 (15:58 +0100)
committer	GitHub <noreply@github.com>
	Wed, 24 Nov 2021 14:58:40 +0000 (15:58 +0100)
		1	2
pdns/dnsdist-console.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/docs/reference/config.rst	patch \|	diff1 \|	diff2 \|	blob \| history