Merge pull request #12862 from omoerbeek/rec-recursion-bound

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

Wed, 31 May 2023 07:52:37 +0000 (09:52 +0200)

committer GitHub <noreply@github.com>

Wed, 31 May 2023 07:52:37 +0000 (09:52 +0200)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Wed, 31 May 2023 07:52:37 +0000 (09:52 +0200)
committer GitHub <noreply@github.com>
Wed, 31 May 2023 07:52:37 +0000 (09:52 +0200)
diff --cc pdns/recursordist/docs/settings.rst
Simple merge
diff --cc pdns/recursordist/rec-main.cc
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Wed, 31 May 2023 07:52:37 +0000 (09:52 +0200)
committer	GitHub <noreply@github.com>
	Wed, 31 May 2023 07:52:37 +0000 (09:52 +0200)
		1	2
pdns/recursordist/docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/rec-main.cc	patch \|	diff1 \|	diff2 \|	blob \| history