Merge pull request #6341 from pieterlexis/rec-dname-support

author aerique <erik.winkels@powerdns.com>

Fri, 26 Apr 2019 11:47:18 +0000 (13:47 +0200)

committer GitHub <noreply@github.com>

Fri, 26 Apr 2019 11:47:18 +0000 (13:47 +0200)
author aerique <erik.winkels@powerdns.com>
Fri, 26 Apr 2019 11:47:18 +0000 (13:47 +0200)
committer GitHub <noreply@github.com>
Fri, 26 Apr 2019 11:47:18 +0000 (13:47 +0200)
diff --cc pdns/packethandler.cc
Simple merge
diff --cc pdns/recursordist/test-syncres_cc.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	aerique <erik.winkels@powerdns.com>
	Fri, 26 Apr 2019 11:47:18 +0000 (13:47 +0200)
committer	GitHub <noreply@github.com>
	Fri, 26 Apr 2019 11:47:18 +0000 (13:47 +0200)
		1	2
pdns/packethandler.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/test-syncres_cc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history