Merge remote-tracking branch 'main/master' into luaqa

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

Mon, 26 Oct 2015 07:51:40 +0000 (08:51 +0100)

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

Mon, 26 Oct 2015 07:51:40 +0000 (08:51 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Mon, 26 Oct 2015 07:51:40 +0000 (08:51 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Mon, 26 Oct 2015 07:51:40 +0000 (08:51 +0100)
diff --cc pdns/Makefile.am

index 75c2bfc13f9a1a52728c0072cb701b1478cf3268,7cf651454a09476c7c3135d298a11ba5803dec1e..9828c4e8ac1673ad7602babfdc647ca681dc6461
--- 1/pdns/Makefile.am
--- 2/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@@ -109,7 -110,7 +110,8 @@@ EXTRA_PROGRAMS = 
         dnstcpbench \
         dnswasher \
         dumresp \
+ +      kvresp \
+       ixplore \
         notify \
         nproxy \
         nsec3dig \
diff --cc pdns/lua-pdns.cc
Simple merge
diff --cc pdns/lua-recursor.cc
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Mon, 26 Oct 2015 07:51:40 +0000 (08:51 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Mon, 26 Oct 2015 07:51:40 +0000 (08:51 +0100)
		1	2
pdns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/lua-pdns.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/lua-recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history