Merge pull request #14954 from neheb/mm

author Remi Gacogne <remi.gacogne@powerdns.com>

Mon, 20 Jan 2025 16:20:34 +0000 (17:20 +0100)

committer GitHub <noreply@github.com>

Mon, 20 Jan 2025 16:20:34 +0000 (17:20 +0100)
author Remi Gacogne <remi.gacogne@powerdns.com>
Mon, 20 Jan 2025 16:20:34 +0000 (17:20 +0100)
committer GitHub <noreply@github.com>
Mon, 20 Jan 2025 16:20:34 +0000 (17:20 +0100)
diff --cc pdns/dnspacket.cc
Simple merge
diff --cc pdns/dnsparser.cc
Simple merge
diff --cc pdns/dnsparser.hh
Simple merge
diff --cc pdns/lua-record.cc
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Mon, 20 Jan 2025 16:20:34 +0000 (17:20 +0100)
committer	GitHub <noreply@github.com>
	Mon, 20 Jan 2025 16:20:34 +0000 (17:20 +0100)
		1	2
pdns/dnspacket.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsparser.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsparser.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/lua-record.cc	patch \|	diff1 \|	diff2 \|	blob \| history