]> granicus.if.org Git - pdns/commitdiff
Merge remote-tracking branch 'origin/master' into double-cname-dns64
authorPieter Lexis <pieter.lexis@powerdns.com>
Mon, 14 Jan 2019 16:31:14 +0000 (17:31 +0100)
committerPieter Lexis <pieter.lexis@powerdns.com>
Mon, 14 Jan 2019 16:31:14 +0000 (17:31 +0100)
1  2 
pdns/lua-recursor4.cc
regression-tests.recursor-dnssec/recursortests.py

Simple merge