Merge pull request #6713 from mind04/bogus-ring

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

Thu, 21 Jun 2018 07:58:32 +0000 (09:58 +0200)

committer GitHub <noreply@github.com>

Thu, 21 Jun 2018 07:58:32 +0000 (09:58 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Thu, 21 Jun 2018 07:58:32 +0000 (09:58 +0200)
committer GitHub <noreply@github.com>
Thu, 21 Jun 2018 07:58:32 +0000 (09:58 +0200)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/rec_channel_rec.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Thu, 21 Jun 2018 07:58:32 +0000 (09:58 +0200)
committer	GitHub <noreply@github.com>
	Thu, 21 Jun 2018 07:58:32 +0000 (09:58 +0200)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/rec_channel_rec.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history