Skip to content

Merge develop branch into master (CLI) - #463 - #470

Merged
matsduf merged 5 commits into
masterfrom
develop
Oct 1, 2026
Merged

matsduf merged 5 commits into
masterfrom
develop

Conversation

@matsduf

@matsduf matsduf commented Oct 1, 2026

Copy link
Copy Markdown
Contributor

Purpose

This PR is step https://github.com/zonemaster/zonemaster/blob/develop/docs/internal/maintenance/ReleaseProcess-release.md#15-merge-develop-branch-into-master

How to test this PR

"No reviewer or approval is required for this update."

matsduf and others added 5 commits June 29, 2026 20:17
Merge master branch into develop (CLI)
When the zone being tested is the root zone and undelegated data was
provided by the user, zonemaster-cli failed to discard all previously
loaded root hints before taking the undelegated data into account.
Instead, the undelegated data was simply merged with the existing hints.

For example, if doing an undelegated test of the root zone with
undelegated data calling the root name servers “ns1” and “ns2”,
previously, a test like Delegation01 erroneously reported 15
authoritative name servers in the child zone (13 from the built-in root
hints + 2 from the undelegated data), instead of just 2.
Override root hints properly when doing undelegated tests on the root zone
Preparation for v2026.1.2 release (CLI)
@matsduf matsduf added this to the v2026.1.2 milestone Oct 1, 2026
@matsduf matsduf added P-High Priority: Issue to be solved before other RC-None Release category: Not to be included in Changes file. labels Oct 1, 2026
@matsduf
matsduf merged commit 423b63a into master Oct 1, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

P-High Priority: Issue to be solved before other RC-None Release category: Not to be included in Changes file.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants