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

Fix Release 23.4.x #4798

Merged
merged 4 commits into from
Jan 24, 2024
Merged

Fix Release 23.4.x #4798

merged 4 commits into from
Jan 24, 2024

Conversation

holmanb
Copy link
Member

@holmanb holmanb commented Jan 23, 2024

Additional Context

Fix #4794, which was introduced in release 23.4.

Test Steps

tox -e py3 tests/unittests/test_ds_identify.py

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>)

ChangeLog Outdated
@@ -1,3 +1,6 @@
23.4.1
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
23.4.1
23.4.2

@aciba90
Copy link
Contributor

aciba90 commented Jan 24, 2024

If we are going to SRU this fix, I think 0f7c16c (at least) should go to main, as any SRUed fix has to land first in the devel release (Noble), right?

I see #4797 now.

Bump the version in cloudinit/version.py to 23.4.2 and update ChangeLog.
Copy link
Contributor

@aciba90 aciba90 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@aciba90 aciba90 merged commit a132f83 into canonical:23.4.x Jan 24, 2024
28 checks passed
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