Merge pull request #5646 from neilcook/deviceid

author Peter van Dijk <peter.van.dijk@powerdns.com>

Tue, 29 Aug 2017 13:22:57 +0000 (15:22 +0200)

committer GitHub <noreply@github.com>

Tue, 29 Aug 2017 13:22:56 +0000 (15:22 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Tue, 29 Aug 2017 13:22:57 +0000 (15:22 +0200)
committer GitHub <noreply@github.com>
Tue, 29 Aug 2017 13:22:56 +0000 (15:22 +0200)
diff --cc contrib/ProtobufLogger.py
Simple merge
diff --cc pdns/dnsmessage.proto
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Tue, 29 Aug 2017 13:22:57 +0000 (15:22 +0200)
committer	GitHub <noreply@github.com>
	Tue, 29 Aug 2017 13:22:56 +0000 (15:22 +0200)
		1	2
contrib/ProtobufLogger.py	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsmessage.proto	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history