]> granicus.if.org Git - pdns/commitdiff
Merge pull request #4597 from pieterlexis/backport-4377-4489
authorPieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 20 Oct 2016 13:13:21 +0000 (15:13 +0200)
committerGitHub <noreply@github.com>
Thu, 20 Oct 2016 13:13:21 +0000 (15:13 +0200)
Backport #4377 and #4489: Caching fixes

1  2 
docs/markdown/recursor/settings.md

Simple merge