Merge pull request #10217 from Habbie/auth-api-cds

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

Wed, 31 Mar 2021 12:00:39 +0000 (14:00 +0200)

committer GitHub <noreply@github.com>

Wed, 31 Mar 2021 12:00:39 +0000 (14:00 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Wed, 31 Mar 2021 12:00:39 +0000 (14:00 +0200)
committer GitHub <noreply@github.com>
Wed, 31 Mar 2021 12:00:39 +0000 (14:00 +0200)
diff --cc pdns/ws-auth.cc
Simple merge
diff --cc regression-tests.api/test_Zones.py
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Wed, 31 Mar 2021 12:00:39 +0000 (14:00 +0200)
committer	GitHub <noreply@github.com>
	Wed, 31 Mar 2021 12:00:39 +0000 (14:00 +0200)
		1	2
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.api/test_Zones.py	patch \|	diff1 \|	diff2 \|	blob \| history