Merge pull request #4837 from rgacogne/dnsdist-rdrule

author Remi Gacogne <rgacogne@users.noreply.github.com>

Thu, 19 Jan 2017 19:44:27 +0000 (20:44 +0100)

committer GitHub <noreply@github.com>

Thu, 19 Jan 2017 19:44:27 +0000 (20:44 +0100)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Thu, 19 Jan 2017 19:44:27 +0000 (20:44 +0100)
committer GitHub <noreply@github.com>
Thu, 19 Jan 2017 19:44:27 +0000 (20:44 +0100)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsdist-lua2.cc
Simple merge
diff --cc pdns/dnsrulactions.hh
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Thu, 19 Jan 2017 19:44:27 +0000 (20:44 +0100)
committer	GitHub <noreply@github.com>
	Thu, 19 Jan 2017 19:44:27 +0000 (20:44 +0100)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua2.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsrulactions.hh	patch \|	diff1 \|	diff2 \|	blob \| history