Merge pull request #9157 from rgacogne/reuseport-lb

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

Fri, 21 Aug 2020 07:59:23 +0000 (09:59 +0200)

committer GitHub <noreply@github.com>

Fri, 21 Aug 2020 07:59:23 +0000 (09:59 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Fri, 21 Aug 2020 07:59:23 +0000 (09:59 +0200)
committer GitHub <noreply@github.com>
Fri, 21 Aug 2020 07:59:23 +0000 (09:59 +0200)
diff --cc pdns/Makefile.am
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/iputils.hh
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Fri, 21 Aug 2020 07:59:23 +0000 (09:59 +0200)
committer	GitHub <noreply@github.com>
	Fri, 21 Aug 2020 07:59:23 +0000 (09:59 +0200)
		1	2
pdns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/iputils.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history