-
Notifications
You must be signed in to change notification settings - Fork 448
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
chore(merge): work/merge-8.3-8.4 into main #5044
Conversation
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
- [ ] Have you followed the [guidelines for contributing](https://github.com/snapcore/snapcraft/blob/master/CONTRIBUTING.md)? - [ ] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)? - [ ] Have you successfully run `tox run -m lint`? - [ ] Have you successfully run `tox run -e test-py310`? (supported versions: `py39`, `py310`, `py311`, `py312`) -----
…5043) Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since hotfix/8.3
was created before we had a changelog, can you add an entry for 8.3.4 as part of this merge?
You can use this: https://github.com/canonical/snapcraft/pull/5037/files#diff-eb29f8aa8710b23f62787ed2d4a3049c01d0d1859b625b20a11e2b523e525694
@mr-cal done |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
63171fd
to
464bd08
Compare
Re-merged and force-pushed because |
This merge PR was built by:
main
;hotfix/8.3
;hotfix/8.4
.No other alterations were needed.