]> granicus.if.org Git - pdns/commitdiff
Merge pull request #2796 from mind04/soaedit
authorPieter Lexis <pieterlexis@users.noreply.github.com>
Wed, 4 Nov 2015 11:33:27 +0000 (12:33 +0100)
committerPieter Lexis <pieterlexis@users.noreply.github.com>
Wed, 4 Nov 2015 11:33:27 +0000 (12:33 +0100)
add global soa-edit settings (already in 3.4.7)

1  2 
pdns/common_startup.cc
pdns/dbdnsseckeeper.cc
pdns/dnsseckeeper.hh
pdns/pdnssec.cc
pdns/rfc2136handler.cc
pdns/tcpreceiver.cc

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