Merge pull request #3450 from rgacogne/dnsdist-lock-cache

author bert hubert <bert.hubert@netherlabs.nl>

Thu, 25 Feb 2016 21:23:44 +0000 (22:23 +0100)

committer bert hubert <bert.hubert@netherlabs.nl>

Thu, 25 Feb 2016 21:23:44 +0000 (22:23 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Thu, 25 Feb 2016 21:23:44 +0000 (22:23 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Thu, 25 Feb 2016 21:23:44 +0000 (22:23 +0100)
diff --cc pdns/dnsdist-tcp.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Thu, 25 Feb 2016 21:23:44 +0000 (22:23 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Thu, 25 Feb 2016 21:23:44 +0000 (22:23 +0100)
		1	2
pdns/dnsdist-tcp.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history