Merge pull request #8177 from RobinGeuze/hiddenDnsKeys

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

Tue, 28 Jan 2020 13:21:50 +0000 (14:21 +0100)

committer GitHub <noreply@github.com>

Tue, 28 Jan 2020 13:21:50 +0000 (14:21 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Tue, 28 Jan 2020 13:21:50 +0000 (14:21 +0100)
committer GitHub <noreply@github.com>
Tue, 28 Jan 2020 13:21:50 +0000 (14:21 +0100)
diff --cc docs/http-api/swagger/authoritative-api-swagger.yaml
Simple merge
diff --cc pdns/dnsseckeeper.hh
Simple merge
diff --cc pdns/tcpreceiver.cc
Simple merge
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>
	Tue, 28 Jan 2020 13:21:50 +0000 (14:21 +0100)
committer	GitHub <noreply@github.com>
	Tue, 28 Jan 2020 13:21:50 +0000 (14:21 +0100)
		1	2
docs/http-api/swagger/authoritative-api-swagger.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsseckeeper.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/tcpreceiver.cc	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