Merge pull request #9623 from zeha/auth-upgrade-typex

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

Mon, 26 Oct 2020 13:41:57 +0000 (14:41 +0100)

committer GitHub <noreply@github.com>

Mon, 26 Oct 2020 13:41:57 +0000 (14:41 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Mon, 26 Oct 2020 13:41:57 +0000 (14:41 +0100)
committer GitHub <noreply@github.com>
Mon, 26 Oct 2020 13:41:57 +0000 (14:41 +0100)
diff --cc docs/settings.rst
Simple merge
diff --cc pdns/common_startup.cc
Simple merge
diff --cc pdns/pdnsutil.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Mon, 26 Oct 2020 13:41:57 +0000 (14:41 +0100)
committer	GitHub <noreply@github.com>
	Mon, 26 Oct 2020 13:41:57 +0000 (14:41 +0100)
		1	2
docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/common_startup.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdnsutil.cc	patch \|	diff1 \|	diff2 \|	blob \| history