]> granicus.if.org Git - pdns/commit
Merge remote-tracking branch 'main/master' into rpz
authorbert hubert <bert.hubert@netherlabs.nl>
Sun, 25 Oct 2015 21:02:53 +0000 (22:02 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Sun, 25 Oct 2015 21:02:53 +0000 (22:02 +0100)
commit04150b8efd10d65dc574b331d5426a491e7e1c44
tree394cf1ec7b10558f9a1f1371da06eff767093c8d
parent1302ddb04222246922c587e2d1a7af5665ad122c
parent5d0bea60d0551a9a09ee857176cc6bf8a70fae88
Merge remote-tracking branch 'main/master' into rpz
pdns/dnsparser.cc
pdns/dnsparser.hh
pdns/dnssecinfra.hh
pdns/pdns_recursor.cc
pdns/reczones.cc
pdns/resolver.cc
pdns/syncres.cc