Merge pull request #6647 from zeha/api-occlude

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Thu, 24 May 2018 14:41:49 +0000 (16:41 +0200)

committer GitHub <noreply@github.com>

Thu, 24 May 2018 14:41:49 +0000 (16:41 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 24 May 2018 14:41:49 +0000 (16:41 +0200)
committer GitHub <noreply@github.com>
Thu, 24 May 2018 14:41:49 +0000 (16:41 +0200)
diff --cc pdns/ws-auth.cc
Simple merge
diff --cc regression-tests.api/test_Zones.py
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Thu, 24 May 2018 14:41:49 +0000 (16:41 +0200)
committer	GitHub <noreply@github.com>
	Thu, 24 May 2018 14:41:49 +0000 (16:41 +0200)
		1	2
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.api/test_Zones.py	patch \|	diff1 \|	diff2 \|	blob \| history