Merge pull request #9699 from omoerbeek/rec-refresh-almost-expired

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

Tue, 12 Jan 2021 10:08:07 +0000 (11:08 +0100)

committer GitHub <noreply@github.com>

Tue, 12 Jan 2021 10:08:07 +0000 (11:08 +0100)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 12 Jan 2021 10:08:07 +0000 (11:08 +0100)
committer GitHub <noreply@github.com>
Tue, 12 Jan 2021 10:08:07 +0000 (11:08 +0100)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/recursordist/Makefile.am
Simple merge
diff --cc regression-tests/recursor-test
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Tue, 12 Jan 2021 10:08:07 +0000 (11:08 +0100)
committer	GitHub <noreply@github.com>
	Tue, 12 Jan 2021 10:08:07 +0000 (11:08 +0100)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests/recursor-test	patch \|	diff1 \|	diff2 \|	blob \| history