Merge pull request #8993 from rgacogne/packetcache-cookies

author Remi Gacogne <remi.gacogne@powerdns.com>

Thu, 17 Sep 2020 12:22:21 +0000 (14:22 +0200)

committer GitHub <noreply@github.com>

Thu, 17 Sep 2020 12:22:21 +0000 (14:22 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Thu, 17 Sep 2020 12:22:21 +0000 (14:22 +0200)
committer GitHub <noreply@github.com>
Thu, 17 Sep 2020 12:22:21 +0000 (14:22 +0200)
diff --cc pdns/Makefile.am
Simple merge
diff --cc pdns/dnsdistdist/Makefile.am
Simple merge
diff --cc pdns/dnsdistdist/dnsdist-lua-bindings-packetcache.cc
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/recursordist/Makefile.am
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Thu, 17 Sep 2020 12:22:21 +0000 (14:22 +0200)
committer	GitHub <noreply@github.com>
	Thu, 17 Sep 2020 12:22:21 +0000 (14:22 +0200)
		1	2
pdns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/dnsdist-lua-bindings-packetcache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history