Merge pull request #7631 from omoerbeek/rec-ecs-cache-limit-with-ttl

author Otto Moerbeek <otto.moerbeek@open-xchange.com>

Tue, 2 Apr 2019 08:38:05 +0000 (10:38 +0200)

committer GitHub <noreply@github.com>

Tue, 2 Apr 2019 08:38:05 +0000 (10:38 +0200)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 2 Apr 2019 08:38:05 +0000 (10:38 +0200)
committer GitHub <noreply@github.com>
Tue, 2 Apr 2019 08:38:05 +0000 (10:38 +0200)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/recursordist/docs/settings.rst
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Tue, 2 Apr 2019 08:38:05 +0000 (10:38 +0200)
committer	GitHub <noreply@github.com>
	Tue, 2 Apr 2019 08:38:05 +0000 (10:38 +0200)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history