Merge pull request #5163 from rgacogne/dnsdist-cleanup-tcp-downstreams

author Peter van Dijk <peter.van.dijk@powerdns.com>

Tue, 21 Mar 2017 13:13:08 +0000 (14:13 +0100)

committer GitHub <noreply@github.com>

Tue, 21 Mar 2017 13:13:08 +0000 (14:13 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Tue, 21 Mar 2017 13:13:08 +0000 (14:13 +0100)
committer GitHub <noreply@github.com>
Tue, 21 Mar 2017 13:13:08 +0000 (14:13 +0100)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsdist-lua2.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Tue, 21 Mar 2017 13:13:08 +0000 (14:13 +0100)
committer	GitHub <noreply@github.com>
	Tue, 21 Mar 2017 13:13:08 +0000 (14:13 +0100)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua2.cc	patch \|	diff1 \|	diff2 \|	blob \| history