]> git.ipfire.org Git - thirdparty/pdns.git/commit
Merge pull request #8421 from rgacogne/ddist-fix-merge-rotation-delay
authorRemi Gacogne <rgacogne@users.noreply.github.com>
Tue, 15 Oct 2019 20:52:16 +0000 (22:52 +0200)
committerGitHub <noreply@github.com>
Tue, 15 Oct 2019 20:52:16 +0000 (22:52 +0200)
commit2ede56707cd1d759dc80f03e7332bac695776088
tree9997e3d21c8848e7b1704d0359c91f231fe8c0fa
parentd32345975a653d96cf8fed2a98bea740b5956664
parent8e8edbe93e7c4d133bf1cf30986e4104608af761
Merge pull request #8421 from rgacogne/ddist-fix-merge-rotation-delay

dnsdist: Fix merge issue (d_ticketsKeyRotationDelay)