Merge pull request #7941 from rgacogne/rec-records-from-gettag-ffi

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

Fri, 16 Aug 2019 09:39:12 +0000 (11:39 +0200)

committer GitHub <noreply@github.com>

Fri, 16 Aug 2019 09:39:12 +0000 (11:39 +0200)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Fri, 16 Aug 2019 09:39:12 +0000 (11:39 +0200)
committer GitHub <noreply@github.com>
Fri, 16 Aug 2019 09:39:12 +0000 (11:39 +0200)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Fri, 16 Aug 2019 09:39:12 +0000 (11:39 +0200)
committer	GitHub <noreply@github.com>
	Fri, 16 Aug 2019 09:39:12 +0000 (11:39 +0200)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history