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

1.33.x: Merge develop into 1.33.x branch #4398

Merged
merged 4 commits into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Correct migrations for public control containers. ([#4388])

## Build Changes
* Update bottlerocket-kernel-kit to 1.1.0 ([#4383], [#4386])
* Update bottlerocket-kernel-kit to 1.1.1 ([#4383], [#4386], [#4394])
* Update bottlerocket-core-kit to 6.0.0 ([#4387])

### Twoliter
Expand All @@ -32,6 +32,7 @@
[#4386]: /~https://github.com/bottlerocket-os/bottlerocket/pull/4386
[#4387]: /~https://github.com/bottlerocket-os/bottlerocket/pull/4387
[#4388]: /~https://github.com/bottlerocket-os/bottlerocket/pull/4388
[#4394]: /~https://github.com/bottlerocket-os/bottlerocket/pull/4394

# v1.32.0 (2025-01-24)

Expand Down
6 changes: 3 additions & 3 deletions Twoliter.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ digest = "HEh3Lx3F6P4OEPnFubF++RMpMW2vlfp/Tc/tGjnBRcM="

[[kit]]
name = "bottlerocket-kernel-kit"
version = "1.1.0"
version = "1.1.1"
vendor = "bottlerocket"
source = "public.ecr.aws/bottlerocket/bottlerocket-kernel-kit:v1.1.0"
digest = "Q0viZGpocSexhrmk2/RqcnBGMfRwXD+51QhwotIkzaE="
source = "public.ecr.aws/bottlerocket/bottlerocket-kernel-kit:v1.1.1"
digest = "47l4jAJ8NL3dIcHw7Dj10y2Ko+0JowYejNed1Zfas4k="

[[kit]]
name = "bottlerocket-core-kit"
Expand Down
2 changes: 1 addition & 1 deletion Twoliter.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ vendor = "bottlerocket"

[[kit]]
name = "bottlerocket-kernel-kit"
version = "1.1.0"
version = "1.1.1"
vendor = "bottlerocket"

[[kit]]
Expand Down
Loading