Merge pull request #9483 from mind04/pdns-consistent

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

Wed, 28 Oct 2020 14:10:33 +0000 (15:10 +0100)

committer GitHub <noreply@github.com>

Wed, 28 Oct 2020 14:10:33 +0000 (15:10 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Wed, 28 Oct 2020 14:10:33 +0000 (15:10 +0100)
committer GitHub <noreply@github.com>
Wed, 28 Oct 2020 14:10:33 +0000 (15:10 +0100)
diff --cc pdns/ueberbackend.cc
Simple merge
diff --cc pdns/ueberbackend.hh
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Wed, 28 Oct 2020 14:10:33 +0000 (15:10 +0100)
committer	GitHub <noreply@github.com>
	Wed, 28 Oct 2020 14:10:33 +0000 (15:10 +0100)
		1	2
pdns/ueberbackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ueberbackend.hh	patch \|	diff1 \|	diff2 \|	blob \| history