Merge pull request #5003 from rgacogne/tsig-tests

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

Tue, 21 Feb 2017 17:55:43 +0000 (18:55 +0100)

committer GitHub <noreply@github.com>

Tue, 21 Feb 2017 17:55:43 +0000 (18:55 +0100)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 21 Feb 2017 17:55:43 +0000 (18:55 +0100)
committer GitHub <noreply@github.com>
Tue, 21 Feb 2017 17:55:43 +0000 (18:55 +0100)
diff --cc pdns/dnspacket.cc
Simple merge
diff --cc pdns/dnssecinfra.cc
Simple merge
diff --cc pdns/resolver.cc
Simple merge
diff --cc pdns/rfc2136handler.cc
Simple merge
diff --cc pdns/slavecommunicator.cc
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Tue, 21 Feb 2017 17:55:43 +0000 (18:55 +0100)
committer	GitHub <noreply@github.com>
	Tue, 21 Feb 2017 17:55:43 +0000 (18:55 +0100)
		1	2
pdns/dnspacket.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnssecinfra.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/resolver.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/rfc2136handler.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/slavecommunicator.cc	patch \|	diff1 \|	diff2 \|	blob \| history