Merge pull request #3170 from rgacogne/dnsdist-spoof-cname

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

Tue, 5 Jan 2016 12:45:46 +0000 (13:45 +0100)

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

Tue, 5 Jan 2016 12:45:46 +0000 (13:45 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Tue, 5 Jan 2016 12:45:46 +0000 (13:45 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Tue, 5 Jan 2016 12:45:46 +0000 (13:45 +0100)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist-tcp.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
diff --cc pdns/dnsrulactions.hh
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Tue, 5 Jan 2016 12:45:46 +0000 (13:45 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Tue, 5 Jan 2016 12:45:46 +0000 (13:45 +0100)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-tcp.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsrulactions.hh	patch \|	diff1 \|	diff2 \|	blob \| history