Skip to content

🌱 Forward-merge v5 into v6 (2 commits) - #17276

Merged
hivecommons-hive[bot] merged 3 commits into
v6from
topup/v5-to-v6-20261108c
Nov 8, 2026
Merged

hivecommons-hive[bot] merged 3 commits into
v6from
topup/v5-to-v6-20261108c

Conversation

@clubanderson

Copy link
Copy Markdown
Member

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.md and added-crux-s1-s2-followups.md are 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.

actions-user and others added 3 commits November 8, 2026 18:50
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>
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>
@clubanderson clubanderson added the no-changelog No changelog fragment required label Nov 8, 2026
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Nov 8, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign kellyaa for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubestellar-prow kubestellar-prow Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 8, 2026
@github-actions

github-actions Bot commented Nov 8, 2026

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v6

Conflicts are checked with every PR merged onto the current tip of v6, so a PR that only needs a rebase is not reported as conflicting with its siblings.

No conflicting open PRs or same-file overlaps were found.

@hivecommons-hive
hivecommons-hive Bot merged commit 8e692fa into v6 Nov 8, 2026
84 of 91 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the topup/v5-to-v6-20261108c branch November 8, 2026 19:06
@hivecommons-hive

Copy link
Copy Markdown
Contributor

Hive status β€” updated in place; edits do not notify. Full history is in the Activity Monitor.

Evidence bundle `#17276251a564` sha256:6f3238b600717967a61f1d08e51ce66b1395230bb477bc14875e18956adb64be β€” download from the dashboard or `hivectl review evidence #17276`.

@github-actions

github-actions Bot commented Nov 8, 2026

Copy link
Copy Markdown
Contributor

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback

@hivecommons-hive

Copy link
Copy Markdown
Contributor

merged by Hive trusted-author auto-merge: author @clubanderson holds role owner and GitHub permission admin on repo; CI green at 251a564.

hivecommons-hive Bot pushed a commit to Danathar/hive that referenced this pull request Nov 8, 2026
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dco-signoff: yes Indicates the PR's author has signed the DCO. no-changelog No changelog fragment required size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants