Merge pull request #10057 from rgacogne/rec-no-zone-cut-computation

author Otto Moerbeek <otto.moerbeek@open-xchange.com>

Tue, 23 Mar 2021 11:48:02 +0000 (12:48 +0100)

committer GitHub <noreply@github.com>

Tue, 23 Mar 2021 11:48:02 +0000 (12:48 +0100)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 23 Mar 2021 11:48:02 +0000 (12:48 +0100)
committer GitHub <noreply@github.com>
Tue, 23 Mar 2021 11:48:02 +0000 (12:48 +0100)
diff --cc pdns/recursordist/test-syncres_cc1.cc
Simple merge
diff --cc pdns/recursordist/test-syncres_cc2.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
diff --cc pdns/validate.cc
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Tue, 23 Mar 2021 11:48:02 +0000 (12:48 +0100)
committer	GitHub <noreply@github.com>
	Tue, 23 Mar 2021 11:48:02 +0000 (12:48 +0100)
		1	2
pdns/recursordist/test-syncres_cc1.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/test-syncres_cc2.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/validate.cc	patch \|	diff1 \|	diff2 \|	blob \| history