Merge pull request #4989 from rgacogne/dnsdist-snmp-clean

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Tue, 21 Feb 2017 08:58:06 +0000 (09:58 +0100)

committer GitHub <noreply@github.com>

Tue, 21 Feb 2017 08:58:06 +0000 (09:58 +0100)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 21 Feb 2017 08:58:06 +0000 (09:58 +0100)
committer GitHub <noreply@github.com>
Tue, 21 Feb 2017 08:58:06 +0000 (09:58 +0100)
diff --cc build-scripts/travis.sh
Simple merge
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsdist-console.cc
Simple merge
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist-lua2.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Tue, 21 Feb 2017 08:58:06 +0000 (09:58 +0100)
committer	GitHub <noreply@github.com>
	Tue, 21 Feb 2017 08:58:06 +0000 (09:58 +0100)
		1	2
build-scripts/travis.sh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-console.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua2.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history