]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #10567 from omoerbeek/rec-eventtrace
authorOtto Moerbeek <otto.moerbeek@open-xchange.com>
Thu, 14 Oct 2021 12:19:13 +0000 (14:19 +0200)
committerGitHub <noreply@github.com>
Thu, 14 Oct 2021 12:19:13 +0000 (14:19 +0200)
Rec: eventtrace

1  2 
.github/actions/spell-check/expect.txt
pdns/pdns_recursor.cc
pdns/rec_channel_rec.cc
pdns/syncres.cc
pdns/syncres.hh

Simple merge
Simple merge
diff --cc pdns/syncres.cc
Simple merge
diff --cc pdns/syncres.hh
index e3382e5597c09b6570fb3ebcb4f01d54532cd2c9,20892d3334a9825beee1c30e91e3c5986dcc958b..d5b84f37ddb396a7db339b947d775d8a960fde4d
@@@ -52,8 -52,8 +52,9 @@@
  #include "proxy-protocol.hh"
  #include "sholder.hh"
  #include "histogram.hh"
 +#include "stat_t.hh"
  #include "tcpiohandler.hh"
+ #include "rec-eventtrace.hh"
  
  #ifdef HAVE_CONFIG_H
  #include "config.h"