Merge pull request #9659 from zeha/ignore-unknown-settings

author Peter van Dijk <peter.van.dijk@powerdns.com>

Thu, 1 Apr 2021 09:43:49 +0000 (11:43 +0200)

committer GitHub <noreply@github.com>

Thu, 1 Apr 2021 09:43:49 +0000 (11:43 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Thu, 1 Apr 2021 09:43:49 +0000 (11:43 +0200)
committer GitHub <noreply@github.com>
Thu, 1 Apr 2021 09:43:49 +0000 (11:43 +0200)
diff --cc docs/settings.rst
Simple merge
diff --cc pdns/misc.hh
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Thu, 1 Apr 2021 09:43:49 +0000 (11:43 +0200)
committer	GitHub <noreply@github.com>
	Thu, 1 Apr 2021 09:43:49 +0000 (11:43 +0200)
		1	2
docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/misc.hh	patch \|	diff1 \|	diff2 \|	blob \| history