]> granicus.if.org Git - pdns/commitdiff
Merge remote-tracking branch 'origin/master' into fix-boost-random-header
authorPieter Lexis <pieter.lexis@powerdns.com>
Mon, 21 Jan 2019 09:22:14 +0000 (10:22 +0100)
committerPieter Lexis <pieter.lexis@powerdns.com>
Mon, 21 Jan 2019 09:22:14 +0000 (10:22 +0100)
1  2 
pdns/dnsdist.cc
pdns/dnsdist.hh
pdns/pdns_recursor.cc

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