From: Ondřej Surý <ondrej@isc.org>
Date: Fri, 16 Apr 2021 12:35:25 +0000 (+0000)
Subject: Merge branch '2623-9-16-13-overwrites-master-files-if-old-format-jnl-files-are-presen... 
X-Git-Tag: v9.16.16~37
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b6b891c407f24fabe571f51f74d404369edfcb2c;p=thirdparty%2Fbind9.git

Merge branch '2623-9-16-13-overwrites-master-files-if-old-format-jnl-files-are-present-v9_16' into 'v9_16'

Fixing a recoverable journal should not result in the zone being written [v9.16]

See merge request isc-projects/bind9!4900
---

b6b891c407f24fabe571f51f74d404369edfcb2c