Merge pull request #6102 from ahupowerdns/better-ednssize-log

author bert hubert <bert.hubert@netherlabs.nl>

Tue, 27 Mar 2018 23:37:08 +0000 (00:37 +0100)

committer GitHub <noreply@github.com>

Tue, 27 Mar 2018 23:37:08 +0000 (00:37 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Tue, 27 Mar 2018 23:37:08 +0000 (00:37 +0100)
committer GitHub <noreply@github.com>
Tue, 27 Mar 2018 23:37:08 +0000 (00:37 +0100)
diff --cc pdns/common_startup.cc
Simple merge
diff --cc pdns/dnspacket.cc
Simple merge
diff --cc pdns/dnspacket.hh
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Tue, 27 Mar 2018 23:37:08 +0000 (00:37 +0100)
committer	GitHub <noreply@github.com>
	Tue, 27 Mar 2018 23:37:08 +0000 (00:37 +0100)
		1	2
pdns/common_startup.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnspacket.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnspacket.hh	patch \|	diff1 \|	diff2 \|	blob \| history