Merge pull request #4859 from RobinGeuze/changeTruncateTCToDefaultToOff

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

Mon, 30 Jan 2017 15:58:30 +0000 (16:58 +0100)

committer GitHub <noreply@github.com>

Mon, 30 Jan 2017 15:58:30 +0000 (16:58 +0100)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Mon, 30 Jan 2017 15:58:30 +0000 (16:58 +0100)
committer GitHub <noreply@github.com>
Mon, 30 Jan 2017 15:58:30 +0000 (16:58 +0100)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsdist-console.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Mon, 30 Jan 2017 15:58:30 +0000 (16:58 +0100)
committer	GitHub <noreply@github.com>
	Mon, 30 Jan 2017 15:58:30 +0000 (16:58 +0100)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-console.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history