]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #10287 from xiaolong-666/master
authorOtto Moerbeek <otto.moerbeek@open-xchange.com>
Thu, 15 Apr 2021 06:39:09 +0000 (08:39 +0200)
committerGitHub <noreply@github.com>
Thu, 15 Apr 2021 06:39:09 +0000 (08:39 +0200)
rec: remove delegation only (issue #7544)

1  2 
pdns/pdns_recursor.cc
pdns/rec_channel_rec.cc
pdns/syncres.cc
pdns/syncres.hh
pdns/ws-recursor.cc

Simple merge
Simple merge
diff --cc pdns/syncres.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
Simple merge