Merge pull request #7478 from rgacogne/rec-max-cache-bogus-ttl

author Remi Gacogne <rgacogne@users.noreply.github.com>

Thu, 21 Feb 2019 09:14:43 +0000 (10:14 +0100)

committer GitHub <noreply@github.com>

Thu, 21 Feb 2019 09:14:43 +0000 (10:14 +0100)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Thu, 21 Feb 2019 09:14:43 +0000 (10:14 +0100)
committer GitHub <noreply@github.com>
Thu, 21 Feb 2019 09:14:43 +0000 (10:14 +0100)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/recursor_cache.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Thu, 21 Feb 2019 09:14:43 +0000 (10:14 +0100)
committer	GitHub <noreply@github.com>
	Thu, 21 Feb 2019 09:14:43 +0000 (10:14 +0100)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursor_cache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history