Merge pull request #8474 from omoerbeek/auth-fix-logging-no-cache

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

Thu, 23 Jan 2020 23:05:52 +0000 (00:05 +0100)

committer GitHub <noreply@github.com>

Thu, 23 Jan 2020 23:05:52 +0000 (00:05 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Thu, 23 Jan 2020 23:05:52 +0000 (00:05 +0100)
committer GitHub <noreply@github.com>
Thu, 23 Jan 2020 23:05:52 +0000 (00:05 +0100)
diff --cc pdns/common_startup.cc
Simple merge
diff --cc pdns/tcpreceiver.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Thu, 23 Jan 2020 23:05:52 +0000 (00:05 +0100)
committer	GitHub <noreply@github.com>
	Thu, 23 Jan 2020 23:05:52 +0000 (00:05 +0100)
		1	2
pdns/common_startup.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/tcpreceiver.cc	patch \|	diff1 \|	diff2 \|	blob \| history