Merge pull request #12678 from rgacogne/ddist-incoming-nghttp2

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

Thu, 7 Sep 2023 10:24:23 +0000 (12:24 +0200)

committer GitHub <noreply@github.com>

Thu, 7 Sep 2023 10:24:23 +0000 (12:24 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Thu, 7 Sep 2023 10:24:23 +0000 (12:24 +0200)
committer GitHub <noreply@github.com>
Thu, 7 Sep 2023 10:24:23 +0000 (12:24 +0200)
diff --cc pdns/dnsdistdist/Makefile.am
Simple merge
diff --cc pdns/dnsdistdist/configure.ac
Simple merge
diff --cc tasks.py
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Thu, 7 Sep 2023 10:24:23 +0000 (12:24 +0200)
committer	GitHub <noreply@github.com>
	Thu, 7 Sep 2023 10:24:23 +0000 (12:24 +0200)
		1	2
pdns/dnsdistdist/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
tasks.py	patch \|	diff1 \|	diff2 \|	blob \| history