Merge pull request #5716 from rgacogne/rec-cut-ds

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

Thu, 28 Sep 2017 18:44:12 +0000 (20:44 +0200)

committer GitHub <noreply@github.com>

Thu, 28 Sep 2017 18:44:12 +0000 (20:44 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Thu, 28 Sep 2017 18:44:12 +0000 (20:44 +0200)
committer GitHub <noreply@github.com>
Thu, 28 Sep 2017 18:44:12 +0000 (20:44 +0200)
diff --cc pdns/syncres.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Thu, 28 Sep 2017 18:44:12 +0000 (20:44 +0200)
committer	GitHub <noreply@github.com>
	Thu, 28 Sep 2017 18:44:12 +0000 (20:44 +0200)
		1	2
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history