Merge pull request #8001 from chbruyand/protobuf-devicename-field

author Otto Moerbeek <otto.moerbeek@open-xchange.com>

Wed, 3 Jul 2019 12:01:12 +0000 (14:01 +0200)

committer GitHub <noreply@github.com>

Wed, 3 Jul 2019 12:01:12 +0000 (14:01 +0200)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Wed, 3 Jul 2019 12:01:12 +0000 (14:01 +0200)
committer GitHub <noreply@github.com>
Wed, 3 Jul 2019 12:01:12 +0000 (14:01 +0200)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc regression-tests.recursor-dnssec/test_Protobuf.py
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Wed, 3 Jul 2019 12:01:12 +0000 (14:01 +0200)
committer	GitHub <noreply@github.com>
	Wed, 3 Jul 2019 12:01:12 +0000 (14:01 +0200)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.recursor-dnssec/test_Protobuf.py	patch \|	diff1 \|	diff2 \|	blob \| history