]> granicus.if.org Git - pdns/commitdiff
Merge remote-tracking branch 'rgacogne/dnsdist-protobuf'
authorbert hubert <bert.hubert@powerdns.com>
Thu, 24 Mar 2016 08:34:01 +0000 (09:34 +0100)
committerbert hubert <bert.hubert@powerdns.com>
Thu, 24 Mar 2016 08:34:01 +0000 (09:34 +0100)
1  2 
pdns/dnsdist-lua2.cc
pdns/dnsdist.cc

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