Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 24.1 #4988

Merged
merged 1 commit into from
Mar 1, 2024
Merged

Release 24.1 #4988

merged 1 commit into from
Mar 1, 2024

Conversation

holmanb
Copy link
Member

@holmanb holmanb commented Mar 1, 2024

Proposed Commit Message

Release 24.1

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

Additional Context

Steps:

  1. pushed new branch 24.1.x which matches upstream main
  2. upstream-release 24.1 23.4.4
  3. redact minor release changelog entries

Merge type

  • Squash merge using "Proposed Commit Message"
  • Rebase and merge unique commits. Requires commit messages per-commit each referencing the pull request number (#<PR_NUM>)

Copy link
Member

@TheRealFalcon TheRealFalcon left a comment

Choose a reason for hiding this comment

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

LGTM! I would just ensure @blackboxsw 's release notes don't also include any changelog changes too

Copy link
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.

LGTM. only minor ChangeLog diff to avoid duplicate entries given previous release 23.4.1-4 Changelog entries sync'd earlier from hotfix branch

--- a/ChangeLog
+++ b/ChangeLog
@@ -13,8 +13,6 @@
  - test: Fix xfail to check the dhcp client name (#4971)
  - tests: avoid console prompts when removing gpg on Noble
  - test: fix test_get_status_systemd_failure
- - fix(nocloud): smbios datasource definition
- - tests: Check that smbios seed works
  - fix: Remove hardcoded /var/lib/cloud hotplug path (#4940)
  - refactor: Refactor status.py (#4864)
  - test: Use correct lxd network-config keys (#4950)
@@ -94,7 +92,6 @@
  - fix(schema cli): avoid netplan validation on net-config version 1
  - tests: reduce expected reports due to dropped rightscale module
  - tests(net-config): add awareness of netplan on stable Ubuntu
- - fix(source): fix argument boundaries when parsing cmdline (#4825)
    [Gilbert Gilb's]
  - feat: fall back to cdrom_id eject if eject is not available (#4769)
    [Cat Red]
@@ -208,7 +205,6 @@
  - doc: Document boot status meaning (#4670)
  - doc: Set expectations for new datasources (#4670)
  - ci: Show linkcheck broken links in job output (#4670)
- - fix: Handle systemctl commands when dbus not ready (#4681)
  - dmi: Add support for OpenBSD (#4654) [Mina Galić]
  - ds-identify: fake dmidecode support on OpenBSD (#4654) [Mina Galić]
  - ds-identify: add OpenBSD support in uname (#4654) [Mina Galić]

Copy link
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.

approved given minor diff ti Changelog to redact duplicates. not critical if you want to avoid that work.

Bump the version in cloudinit/version.py to 24.1 and
update ChangeLog.
@holmanb holmanb merged commit 49df547 into canonical:24.1.x Mar 1, 2024
29 checks passed
@TheRealFalcon
Copy link
Member

TheRealFalcon commented Mar 1, 2024

I just noticed that this PR wasn't against main. This should go into main too

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.

3 participants