Merge pull request #11427 from rgacogne/ddist-channels

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

Wed, 21 Jun 2023 08:16:29 +0000 (10:16 +0200)

committer GitHub <noreply@github.com>

Wed, 21 Jun 2023 08:16:29 +0000 (10:16 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Wed, 21 Jun 2023 08:16:29 +0000 (10:16 +0200)
committer GitHub <noreply@github.com>
Wed, 21 Jun 2023 08:16:29 +0000 (10:16 +0200)
diff --cc pdns/Makefile.am
Simple merge
diff --cc pdns/dnsdistdist/Makefile.am
Simple merge
diff --cc pdns/recursordist/rec-snmp.cc
Simple merge
diff --cc pdns/snmp-agent.cc
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Wed, 21 Jun 2023 08:16:29 +0000 (10:16 +0200)
committer	GitHub <noreply@github.com>
	Wed, 21 Jun 2023 08:16:29 +0000 (10:16 +0200)
		1	2
pdns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/rec-snmp.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/snmp-agent.cc	patch \|	diff1 \|	diff2 \|	blob \| history