Merge pull request #13208 from neheb/pai

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

Thu, 7 Sep 2023 07:15:34 +0000 (09:15 +0200)

committer GitHub <noreply@github.com>

Thu, 7 Sep 2023 07:15:34 +0000 (09:15 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Thu, 7 Sep 2023 07:15:34 +0000 (09:15 +0200)
committer GitHub <noreply@github.com>
Thu, 7 Sep 2023 07:15:34 +0000 (09:15 +0200)
diff --cc pdns/channel.hh
Simple merge
diff --cc pdns/pdnsutil.cc
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Thu, 7 Sep 2023 07:15:34 +0000 (09:15 +0200)
committer	GitHub <noreply@github.com>
	Thu, 7 Sep 2023 07:15:34 +0000 (09:15 +0200)
		1	2
pdns/channel.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdnsutil.cc	patch \|	diff1 \|	diff2 \|	blob \| history