Merge pull request #4764 from rgacogne/dnsdist-tcp-workers-vect-race

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

Wed, 14 Dec 2016 09:53:25 +0000 (10:53 +0100)

committer GitHub <noreply@github.com>

Wed, 14 Dec 2016 09:53:25 +0000 (10:53 +0100)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Wed, 14 Dec 2016 09:53:25 +0000 (10:53 +0100)
committer GitHub <noreply@github.com>
Wed, 14 Dec 2016 09:53:25 +0000 (10:53 +0100)
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Wed, 14 Dec 2016 09:53:25 +0000 (10:53 +0100)
committer	GitHub <noreply@github.com>
	Wed, 14 Dec 2016 09:53:25 +0000 (10:53 +0100)
		1	2
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history