Merge pull request #5226 from pieterlexis/syncres-refactor-mv-negcache

author Remi Gacogne <rgacogne@users.noreply.github.com>

Tue, 11 Apr 2017 09:05:13 +0000 (11:05 +0200)

committer GitHub <noreply@github.com>

Tue, 11 Apr 2017 09:05:13 +0000 (11:05 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Tue, 11 Apr 2017 09:05:13 +0000 (11:05 +0200)
committer GitHub <noreply@github.com>
Tue, 11 Apr 2017 09:05:13 +0000 (11:05 +0200)
diff --cc pdns/dnsname.cc
Simple merge
diff --cc pdns/dnsname.hh
Simple merge
diff --cc pdns/recursordist/Makefile.am
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Tue, 11 Apr 2017 09:05:13 +0000 (11:05 +0200)
committer	GitHub <noreply@github.com>
	Tue, 11 Apr 2017 09:05:13 +0000 (11:05 +0200)
		1	2
pdns/dnsname.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsname.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history