Skip to content

Upstream/25.3#6486

Merged
aciba90 merged 1 commit into
canonical:mainfrom
aciba90:upstream/25.3
Sep 26, 2025
Merged

Upstream/25.3#6486
aciba90 merged 1 commit into
canonical:mainfrom
aciba90:upstream/25.3

Conversation

@aciba90
Copy link
Copy Markdown
Contributor

@aciba90 aciba90 commented Sep 25, 2025

Bump the version in cloudinit/version.py to 25.3 and update ChangeLog.

Bump the version in cloudinit/version.py to 25.3 and
update ChangeLog.
@aciba90 aciba90 requested a review from blackboxsw September 25, 2025 13:38
Copy link
Copy Markdown
Collaborator

@blackboxsw blackboxsw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @aciba90. Thanks for the release branch the ChangeLog changes look good to me, but the branch target is off which is indicated by a huge visual delta in this proposal. We should generally only see simple ChangeLog and clodinit.version.py changes in the upstream release cut. Our policy project docs tell us to Push the branch up for review and create a pull request against main. We will use that PR for some documentation on things that have been tested.

I don't think we want additional upstream/25.3 branches per-se, we just want a detached annotated tag living in main that we then can pull into an eventual 25.3.x ongoing branch if we have to generate hotfixes at some point.

+1 otherwise. I'll adapt the merge target from upstream/25.3 to main and see if this gives us a better diff. Also we should delete upstream/upstream/25.3 if it is a branch as that is just pollution our project remote.

@blackboxsw blackboxsw changed the base branch from upstream/25.3 to main September 26, 2025 04:29
Copy link
Copy Markdown
Collaborator

@blackboxsw blackboxsw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok now we are approved. single commit LGTM!. Ship it and git tag -a 25.3 it.

@aciba90 aciba90 merged commit cb12e00 into canonical:main Sep 26, 2025
21 of 22 checks passed
blackboxsw pushed a commit to blackboxsw/cloud-init that referenced this pull request Nov 17, 2025
Bump the version in cloudinit/version.py to 25.3 and
update ChangeLog.
blackboxsw pushed a commit to blackboxsw/cloud-init that referenced this pull request Dec 3, 2025
Bump the version in cloudinit/version.py to 25.3 and
update ChangeLog.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants