Merge pull request #8659 from rgacogne/auth-dnsseckeeper-clear-static

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

Fri, 24 Jan 2020 14:48:55 +0000 (15:48 +0100)

committer GitHub <noreply@github.com>

Fri, 24 Jan 2020 14:48:55 +0000 (15:48 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Fri, 24 Jan 2020 14:48:55 +0000 (15:48 +0100)
committer GitHub <noreply@github.com>
Fri, 24 Jan 2020 14:48:55 +0000 (15:48 +0100)
diff --cc pdns/tcpreceiver.cc
Simple merge
diff --cc pdns/ws-auth.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Fri, 24 Jan 2020 14:48:55 +0000 (15:48 +0100)
committer	GitHub <noreply@github.com>
	Fri, 24 Jan 2020 14:48:55 +0000 (15:48 +0100)
		1	2
pdns/tcpreceiver.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history