Merge pull request #6668 from zeha/api-zone-lookup

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

Thu, 30 Aug 2018 09:48:24 +0000 (11:48 +0200)

committer GitHub <noreply@github.com>

Thu, 30 Aug 2018 09:48:24 +0000 (11:48 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 30 Aug 2018 09:48:24 +0000 (11:48 +0200)
committer GitHub <noreply@github.com>
Thu, 30 Aug 2018 09:48:24 +0000 (11:48 +0200)
diff --cc docs/http-api/swagger/authoritative-api-swagger.yaml
Simple merge
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, 30 Aug 2018 09:48:24 +0000 (11:48 +0200)
committer	GitHub <noreply@github.com>
	Thu, 30 Aug 2018 09:48:24 +0000 (11:48 +0200)
		1	2
docs/http-api/swagger/authoritative-api-swagger.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.api/test_Zones.py	patch \|	diff1 \|	diff2 \|	blob \| history