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

chore: cherry-pick changes from develop to 1.22.x #4185

Merged
merged 2 commits into from
Sep 9, 2024

Conversation

ginglis13
Copy link
Contributor

Issue number:

n/a

Description of changes:

cherry-pick 588dff9 and 09d84bd

Testing done:

n/a

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

vyaghras and others added 2 commits September 9, 2024 20:25
(cherry picked from commit 09d84bd)
Signed-off-by: Gavin Inglis <[email protected]>
Signed-off-by: Gavin Inglis <[email protected]>
(cherry picked from commit 588dff9)
Signed-off-by: Gavin Inglis <[email protected]>
@ginglis13 ginglis13 changed the base branch from develop to 1.22.x September 9, 2024 20:27
@ginglis13 ginglis13 merged commit b6684b7 into bottlerocket-os:1.22.x Sep 9, 2024
32 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.

3 participants