]> granicus.if.org Git - pdns/commitdiff
Merge pull request #2142 from zeha/untangle-dnsbackend-ueberbackend
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Fri, 13 Feb 2015 22:36:23 +0000 (23:36 +0100)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Fri, 13 Feb 2015 22:36:23 +0000 (23:36 +0100)
Stop pretending UeberBackend is a normal DNSBackend

1  2 
pdns/Makefile.am
pdns/dnsbackend.hh
pdns/dnspacket.cc
pdns/dnspacket.hh
pdns/dnssecsigner.cc
pdns/packethandler.cc
pdns/tcpreceiver.cc
pdns/ws-auth.cc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc pdns/ws-auth.cc
Simple merge