Merge pull request #7326 from jonathaneen/add_type_filter_to_api_search

author aerique <aerique@xs4all.nl>

Tue, 26 Feb 2019 14:14:52 +0000 (15:14 +0100)

committer GitHub <noreply@github.com>

Tue, 26 Feb 2019 14:14:52 +0000 (15:14 +0100)
author aerique <aerique@xs4all.nl>
Tue, 26 Feb 2019 14:14:52 +0000 (15:14 +0100)
committer GitHub <noreply@github.com>
Tue, 26 Feb 2019 14:14:52 +0000 (15:14 +0100)
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	aerique <aerique@xs4all.nl>
	Tue, 26 Feb 2019 14:14:52 +0000 (15:14 +0100)
committer	GitHub <noreply@github.com>
	Tue, 26 Feb 2019 14:14:52 +0000 (15:14 +0100)
		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