Merge pull request #9385 from rgacogne/rip-out-gss

author Peter van Dijk <peter.van.dijk@powerdns.com>

Thu, 17 Sep 2020 13:50:56 +0000 (15:50 +0200)

committer GitHub <noreply@github.com>

Thu, 17 Sep 2020 13:50:56 +0000 (15:50 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Thu, 17 Sep 2020 13:50:56 +0000 (15:50 +0200)
committer GitHub <noreply@github.com>
Thu, 17 Sep 2020 13:50:56 +0000 (15:50 +0200)
diff --cc pdns/Makefile.am
Simple merge
diff --cc pdns/packethandler.cc
Simple merge
diff --cc pdns/pdnsutil.cc
Simple merge
diff --cc pdns/recursordist/Makefile.am
Simple merge
diff --cc pdns/ws-auth.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Thu, 17 Sep 2020 13:50:56 +0000 (15:50 +0200)
committer	GitHub <noreply@github.com>
	Thu, 17 Sep 2020 13:50:56 +0000 (15:50 +0200)
		1	2
pdns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/packethandler.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdnsutil.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history