Merge pull request #8951 from Habbie/redo-8907

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

Fri, 20 Mar 2020 15:17:47 +0000 (16:17 +0100)

committer GitHub <noreply@github.com>

Fri, 20 Mar 2020 15:17:47 +0000 (16:17 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Fri, 20 Mar 2020 15:17:47 +0000 (16:17 +0100)
committer GitHub <noreply@github.com>
Fri, 20 Mar 2020 15:17:47 +0000 (16:17 +0100)
diff --cc pdns/auth-packetcache.cc
Simple merge
diff --cc pdns/auth-querycache.cc
Simple merge
diff --cc pdns/packethandler.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Fri, 20 Mar 2020 15:17:47 +0000 (16:17 +0100)
committer	GitHub <noreply@github.com>
	Fri, 20 Mar 2020 15:17:47 +0000 (16:17 +0100)
		1	2
pdns/auth-packetcache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/auth-querycache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/packethandler.cc	patch \|	diff1 \|	diff2 \|	blob \| history