Merge pull request #8571 from omoerbeek/rec-better-time-based

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

Tue, 10 Dec 2019 09:47:49 +0000 (10:47 +0100)

committer GitHub <noreply@github.com>

Tue, 10 Dec 2019 09:47:49 +0000 (10:47 +0100)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 10 Dec 2019 09:47:49 +0000 (10:47 +0100)
committer GitHub <noreply@github.com>
Tue, 10 Dec 2019 09:47:49 +0000 (10:47 +0100)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/recursordist/test-syncres_cc2.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Tue, 10 Dec 2019 09:47:49 +0000 (10:47 +0100)
committer	GitHub <noreply@github.com>
	Tue, 10 Dec 2019 09:47:49 +0000 (10:47 +0100)
		1	2
pdns/pdns_recursor.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