]> granicus.if.org Git - pdns/commitdiff
Merge remote-tracking branch 'origin/master' into trustanchor.server
authorPieter Lexis <pieter.lexis@powerdns.com>
Thu, 2 May 2019 11:58:52 +0000 (13:58 +0200)
committerPieter Lexis <pieter.lexis@powerdns.com>
Thu, 2 May 2019 11:58:52 +0000 (13:58 +0200)
1  2 
pdns/pdns_recursor.cc
pdns/recursordist/docs/settings.rst
pdns/syncres.cc

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