Merge pull request #6381 from rgacogne/dnsdist-serverpool-mutex

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Mon, 26 Mar 2018 07:58:49 +0000 (09:58 +0200)

committer GitHub <noreply@github.com>

Mon, 26 Mar 2018 07:58:49 +0000 (09:58 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Mon, 26 Mar 2018 07:58:49 +0000 (09:58 +0200)
committer GitHub <noreply@github.com>
Mon, 26 Mar 2018 07:58:49 +0000 (09:58 +0200)
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist-tcp.cc
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Mon, 26 Mar 2018 07:58:49 +0000 (09:58 +0200)
committer	GitHub <noreply@github.com>
	Mon, 26 Mar 2018 07:58:49 +0000 (09:58 +0200)
		1	2
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-tcp.cc	patch \|	diff1 \|	diff2 \|	blob \| history