Merge pull request #7670 from Habbie/kill-addlua

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

Fri, 5 Apr 2019 12:10:58 +0000 (14:10 +0200)

committer GitHub <noreply@github.com>

Fri, 5 Apr 2019 12:10:58 +0000 (14:10 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Fri, 5 Apr 2019 12:10:58 +0000 (14:10 +0200)
committer GitHub <noreply@github.com>
Fri, 5 Apr 2019 12:10:58 +0000 (14:10 +0200)
diff --cc pdns/dnsdist-lua-actions.cc
Simple merge
diff --cc pdns/dnsdistdist/docs/rules-actions.rst
Simple merge
diff --cc regression-tests.dnsdist/test_EDNSOptions.py
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Fri, 5 Apr 2019 12:10:58 +0000 (14:10 +0200)
committer	GitHub <noreply@github.com>
	Fri, 5 Apr 2019 12:10:58 +0000 (14:10 +0200)
		1	2
pdns/dnsdist-lua-actions.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/docs/rules-actions.rst	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.dnsdist/test_EDNSOptions.py	patch \|	diff1 \|	diff2 \|	blob \| history