Repository navigation
π± Forward-merge v5 into v6 (2 commits) - #17276
Conversation
Automated release commit. Compiles changelog.d/ fragments and moves the CHANGELOG.md Unreleased section into a dated v5.203.0 entry. See src/docs/releases.md. Signed-off-by: hive-release-bot <actions@github.com>
release: v5.203.0
Brings the v5.203.0 release commit onto v6 after #17273. CHANGELOG keeps both lines' sections (v5.203.0 under v6.0.1); the two fragments it compiled are dropped on v6 since v6 now carries them via the v5.203.0 CHANGELOG section. Signed-off-by: Andrew Anderson <andy@clubanderson.com>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of No conflicting open PRs or same-file overlaps were found. |
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
|
merged by Hive trusted-author auto-merge: author @clubanderson holds role owner and GitHub permission admin on repo; CI green at 251a564. |
Brings the crux agent step service (S6, hivecommons#17272) onto v6 after hivecommons#17276. Clean merge, no conflicts; the added-crux-agent-steps fragment stays for the next v6 release. Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Third top-up after #17273: brings the v5.203.0 release commit (#17275) onto v6.
Conflict:
CHANGELOG.mdβ both sides kept, v5.203.0 section placed after v6.0.1.changelog.d/added-maintainer-notes.mdandadded-crux-s1-s2-followups.mdare dropped on v6 because v5.203.0 compiled them and v6 now carries that section in CHANGELOG.Plain merge commit, v5 SHAs/sign-offs preserved. DCO/native-queue-policy reds are expected on forward-merges; to be admin-merged with a merge commit like #17265.