From: Remi Gacogne Date: Tue, 15 Oct 2019 20:52:16 +0000 (+0200) Subject: Merge pull request #8421 from rgacogne/ddist-fix-merge-rotation-delay X-Git-Tag: dnsdist-1.4.0-rc4~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ede56707cd1d759dc80f03e7332bac695776088;p=thirdparty%2Fpdns.git Merge pull request #8421 from rgacogne/ddist-fix-merge-rotation-delay dnsdist: Fix merge issue (d_ticketsKeyRotationDelay) --- 2ede56707cd1d759dc80f03e7332bac695776088