Merge pull request #4008 from ahupowerdns/dnsdist-node

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

Fri, 24 Jun 2016 09:31:11 +0000 (10:31 +0100)

committer GitHub <noreply@github.com>

Fri, 24 Jun 2016 09:31:11 +0000 (10:31 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Fri, 24 Jun 2016 09:31:11 +0000 (10:31 +0100)
committer GitHub <noreply@github.com>
Fri, 24 Jun 2016 09:31:11 +0000 (10:31 +0100)
diff --cc pdns/dnsdist-lua2.cc
Simple merge
diff --cc pdns/dnsdist-tcp.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdistdist/Makefile.am
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Fri, 24 Jun 2016 09:31:11 +0000 (10:31 +0100)
committer	GitHub <noreply@github.com>
	Fri, 24 Jun 2016 09:31:11 +0000 (10:31 +0100)
		1	2
pdns/dnsdist-lua2.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-tcp.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history