Merge pull request #6505 from rgacogne/rec-multi-index

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

Mon, 14 May 2018 09:43:09 +0000 (11:43 +0200)

committer GitHub <noreply@github.com>

Mon, 14 May 2018 09:43:09 +0000 (11:43 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Mon, 14 May 2018 09:43:09 +0000 (11:43 +0200)
committer GitHub <noreply@github.com>
Mon, 14 May 2018 09:43:09 +0000 (11:43 +0200)
diff --cc pdns/recursordist/test-syncres_cc.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Mon, 14 May 2018 09:43:09 +0000 (11:43 +0200)
committer	GitHub <noreply@github.com>
	Mon, 14 May 2018 09:43:09 +0000 (11:43 +0200)
		1	2
pdns/recursordist/test-syncres_cc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history