Merge pull request #15417 from miodvallat/some_other_afternoon

author Miod Vallat <miod.vallat@powerdns.com>

Mon, 30 Jun 2025 12:58:57 +0000 (14:58 +0200)

committer GitHub <noreply@github.com>

Mon, 30 Jun 2025 12:58:57 +0000 (14:58 +0200)
author Miod Vallat <miod.vallat@powerdns.com>
Mon, 30 Jun 2025 12:58:57 +0000 (14:58 +0200)
committer GitHub <noreply@github.com>
Mon, 30 Jun 2025 12:58:57 +0000 (14:58 +0200)
diff --cc docs/upgrading.rst
Simple merge
diff --cc pdns/pdnsutil.cc
Simple merge
author	Miod Vallat <miod.vallat@powerdns.com>
	Mon, 30 Jun 2025 12:58:57 +0000 (14:58 +0200)
committer	GitHub <noreply@github.com>
	Mon, 30 Jun 2025 12:58:57 +0000 (14:58 +0200)
		1	2
docs/upgrading.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdnsutil.cc	patch \|	diff1 \|	diff2 \|	blob \| history