Merge pull request #9470 from zeha/rm-uebersoa

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

Tue, 27 Oct 2020 10:58:36 +0000 (11:58 +0100)

committer GitHub <noreply@github.com>

Tue, 27 Oct 2020 10:58:36 +0000 (11:58 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Tue, 27 Oct 2020 10:58:36 +0000 (11:58 +0100)
committer GitHub <noreply@github.com>
Tue, 27 Oct 2020 10:58:36 +0000 (11:58 +0100)
diff --cc pdns/slavecommunicator.cc
Simple merge
diff --cc pdns/tcpreceiver.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Tue, 27 Oct 2020 10:58:36 +0000 (11:58 +0100)
committer	GitHub <noreply@github.com>
	Tue, 27 Oct 2020 10:58:36 +0000 (11:58 +0100)
		1	2
pdns/slavecommunicator.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/tcpreceiver.cc	patch \|	diff1 \|	diff2 \|	blob \| history