From: Mark Andrews <marka@isc.org>
Date: Tue, 26 Oct 2021 14:54:03 +0000 (+0000)
Subject: Merge branch '2916-duplicate-catalog-zones-is-fatal' into 'main'
X-Git-Tag: v9.17.20~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad57f03389e3dd276c56cfdf4adbc5d60ed53345;p=thirdparty%2Fbind9.git

Merge branch '2916-duplicate-catalog-zones-is-fatal' into 'main'

Resolve "duplicate catalog-zones is fatal"

Closes #2916

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

ad57f03389e3dd276c56cfdf4adbc5d60ed53345