]> granicus.if.org Git - pdns/commitdiff
Merge pull request #3767 from ahupowerdns/dnsdist-yaks
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 27 Apr 2016 14:13:28 +0000 (16:13 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Wed, 27 Apr 2016 14:13:28 +0000 (16:13 +0200)
Please ponder: nodelay, console newlines, print out json, silence some trivia, move to 'return' for Lua statements

1  2 
pdns/dnsdist-console.cc
pdns/dnsdist-lua2.cc
pdns/misc.cc
pdns/misc.hh

Simple merge
Simple merge
diff --cc pdns/misc.cc
Simple merge
diff --cc pdns/misc.hh
Simple merge