Merge pull request #15298 from chbruyand/dnsdist-protobuf

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

Thu, 13 Mar 2025 18:57:57 +0000 (19:57 +0100)

committer GitHub <noreply@github.com>

Thu, 13 Mar 2025 18:57:57 +0000 (19:57 +0100)
author Remi Gacogne <remi.gacogne@powerdns.com>
Thu, 13 Mar 2025 18:57:57 +0000 (19:57 +0100)
committer GitHub <noreply@github.com>
Thu, 13 Mar 2025 18:57:57 +0000 (19:57 +0100)
diff --cc pdns/dnsdistdist/dnsdist-idstate.hh
Simple merge
diff --cc pdns/dnsdistdist/dnsdist-protobuf.cc
Simple merge
diff --cc pdns/dnsdistdist/dnsdist.cc
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Thu, 13 Mar 2025 18:57:57 +0000 (19:57 +0100)
committer	GitHub <noreply@github.com>
	Thu, 13 Mar 2025 18:57:57 +0000 (19:57 +0100)
		1	2
pdns/dnsdistdist/dnsdist-idstate.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/dnsdist-protobuf.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history