Merge pull request #14327 from chbruyand/dnsdist-tickets-key-hook

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

Thu, 4 Jul 2024 11:17:32 +0000 (13:17 +0200)

committer GitHub <noreply@github.com>

Thu, 4 Jul 2024 11:17:32 +0000 (13:17 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Thu, 4 Jul 2024 11:17:32 +0000 (13:17 +0200)
committer GitHub <noreply@github.com>
Thu, 4 Jul 2024 11:17:32 +0000 (13:17 +0200)
diff --cc pdns/dnsdistdist/dnsdist.hh
Simple merge
diff --cc pdns/lock.hh
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Thu, 4 Jul 2024 11:17:32 +0000 (13:17 +0200)
committer	GitHub <noreply@github.com>
	Thu, 4 Jul 2024 11:17:32 +0000 (13:17 +0200)
		1	2
pdns/dnsdistdist/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/lock.hh	patch \|	diff1 \|	diff2 \|	blob \| history