Merge remote-tracking branch 'origin/master' into rec-dnstap

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

Fri, 5 Apr 2019 14:16:00 +0000 (16:16 +0200)

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

Fri, 5 Apr 2019 14:16:00 +0000 (16:16 +0200)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Fri, 5 Apr 2019 14:16:00 +0000 (16:16 +0200)
committer Otto Moerbeek <otto.moerbeek@open-xchange.com>
Fri, 5 Apr 2019 14:16:00 +0000 (16:16 +0200)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/recursordist/Makefile.am
Simple merge
diff --cc pdns/recursordist/configure.ac
Simple merge
diff --cc pdns/recursordist/test-syncres_cc.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>
	Fri, 5 Apr 2019 14:16:00 +0000 (16:16 +0200)
committer	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Fri, 5 Apr 2019 14:16:00 +0000 (16:16 +0200)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/test-syncres_cc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history