Merge pull request #9427 from mind04/pdns-2136-metadata

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

Thu, 24 Sep 2020 08:27:11 +0000 (10:27 +0200)

committer GitHub <noreply@github.com>

Thu, 24 Sep 2020 08:27:11 +0000 (10:27 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Thu, 24 Sep 2020 08:27:11 +0000 (10:27 +0200)
committer GitHub <noreply@github.com>
Thu, 24 Sep 2020 08:27:11 +0000 (10:27 +0200)
diff --cc pdns/packethandler.hh
Simple merge
diff --cc pdns/rfc2136handler.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Thu, 24 Sep 2020 08:27:11 +0000 (10:27 +0200)
committer	GitHub <noreply@github.com>
	Thu, 24 Sep 2020 08:27:11 +0000 (10:27 +0200)
		1	2
pdns/packethandler.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/rfc2136handler.cc	patch \|	diff1 \|	diff2 \|	blob \| history