Merge pull request #7538 from omoerbeek/rec-dnstap

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

Mon, 3 Jun 2019 11:37:37 +0000 (13:37 +0200)

committer GitHub <noreply@github.com>

Mon, 3 Jun 2019 11:37:37 +0000 (13:37 +0200)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Mon, 3 Jun 2019 11:37:37 +0000 (13:37 +0200)
committer GitHub <noreply@github.com>
Mon, 3 Jun 2019 11:37:37 +0000 (13:37 +0200)
diff --cc pdns/lwres.cc
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Mon, 3 Jun 2019 11:37:37 +0000 (13:37 +0200)
committer	GitHub <noreply@github.com>
	Mon, 3 Jun 2019 11:37:37 +0000 (13:37 +0200)
		1	2
pdns/lwres.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history