Merge pull request #6407 from rgacogne/dnsdist-cppcheck

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

Wed, 28 Mar 2018 21:32:12 +0000 (23:32 +0200)

committer GitHub <noreply@github.com>

Wed, 28 Mar 2018 21:32:12 +0000 (23:32 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Wed, 28 Mar 2018 21:32:12 +0000 (23:32 +0200)
committer GitHub <noreply@github.com>
Wed, 28 Mar 2018 21:32:12 +0000 (23:32 +0200)
diff --cc pdns/dnsdist-lua-rules.cc
Simple merge
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Wed, 28 Mar 2018 21:32:12 +0000 (23:32 +0200)
committer	GitHub <noreply@github.com>
	Wed, 28 Mar 2018 21:32:12 +0000 (23:32 +0200)
		1	2
pdns/dnsdist-lua-rules.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history