]> granicus.if.org Git - pdns/commit
Merge remote-tracking branch 'main/master' into ednssurg
authorbert hubert <bert.hubert@powerdns.com>
Thu, 24 Sep 2015 14:49:23 +0000 (16:49 +0200)
committerbert hubert <bert.hubert@powerdns.com>
Thu, 24 Sep 2015 14:49:23 +0000 (16:49 +0200)
commit7e2e4419628db6bcb0428a07bd268abd035a1c7d
tree245dec968f2e14c0ffe17c33ef4896e673329188
parentaf05a909003dded4db267369b64b02db1bcb5a34
parentb9e96b636f5dc6b0e7fb4fcebcb0970687d9194e
Merge remote-tracking branch 'main/master' into ednssurg

Conflicts:
pdns/recursor_cache.cc
pdns/recursor_cache.hh
pdns/syncres.cc
pdns/syncres.hh
pdns/dnsparser.cc
pdns/lwres.cc
pdns/lwres.hh
pdns/pdns_recursor.cc
pdns/recursor_cache.cc
pdns/recursor_cache.hh
pdns/reczones.cc
pdns/secpoll-recursor.cc
pdns/syncres.cc
pdns/syncres.hh