Merge pull request #6170 from zeha/dnstap

author bert hubert <bert.hubert@netherlabs.nl>

Mon, 5 Feb 2018 15:09:03 +0000 (16:09 +0100)

committer GitHub <noreply@github.com>

Mon, 5 Feb 2018 15:09:03 +0000 (16:09 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Mon, 5 Feb 2018 15:09:03 +0000 (16:09 +0100)
committer GitHub <noreply@github.com>
Mon, 5 Feb 2018 15:09:03 +0000 (16:09 +0100)
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdistdist/Makefile.am

index 11cd271b2ed690af54a3c39f8e3783832411147d,c884135f0b7f31ec2704849db96af9c5e271f18d..1bcab9a84f9cfaa9c05d8bebc2776b130be0e730
--- 1/pdns/dnsdistdist/Makefile.am
--- 2/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@@ -117,9 -119,10 +119,10 @@@ dnsdist_SOURCES = 
         namespaces.hh \
         pdnsexception.hh \
         protobuf.cc protobuf.hh \
+       dnstap.cc dnstap.hh \
         qtype.cc qtype.hh \
         remote_logger.cc remote_logger.hh \
- -      selectmplexer.cc \
+ +      pollmplexer.cc \
         sholder.hh \
         snmp-agent.cc snmp-agent.hh \
         sodcrypto.cc sodcrypto.hh \
author	bert hubert <bert.hubert@netherlabs.nl>
	Mon, 5 Feb 2018 15:09:03 +0000 (16:09 +0100)
committer	GitHub <noreply@github.com>
	Mon, 5 Feb 2018 15:09:03 +0000 (16:09 +0100)
		1	2
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history