Skip to content

Commit

Permalink
Merge pull request #4265 from ginglis13/backport-1.26.1
Browse files Browse the repository at this point in the history
Prepare 1.26.x branch for 1.26.1 release
  • Loading branch information
ginglis13 authored Oct 24, 2024
2 parents 85f0d68 + 4e67c8e commit 943d9a4
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 6 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# v1.26.1 (2024-10-24)

## Release Highlights
* Revert system-wide configuration to block writeable/executable memory in systemd services ([bottlerocket-core-kit#215](https://github.com/bottlerocket-os/bottlerocket-core-kit/pull/215))

## Build Changes

### OS Changes
* Update bottlerocket-core-kit to 3.1.1 ([#4264])

[#4264]: https://github.com/bottlerocket-os/bottlerocket/pull/4264

# v1.26.0 (2024-10-23)

## Release Highlights
Expand Down
3 changes: 2 additions & 1 deletion Release.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "1.26.0"
version = "1.26.1"

[migrations]
"(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"]
Expand Down Expand Up @@ -366,3 +366,4 @@ version = "1.26.0"
"migrate_v1.25.0_public-control-container-v0-7-17.lz4",
]
"(1.25.0, 1.26.0)" = []
"(1.26.0, 1.26.1)" = []
6 changes: 3 additions & 3 deletions Twoliter.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ digest = "V2lUX6Rs9rZLg8POxV7P785Mr5nallfyxor0Scrvh3Y="

[[kit]]
name = "bottlerocket-core-kit"
version = "3.1.0"
version = "3.1.1"
vendor = "bottlerocket"
source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v3.1.0"
digest = "tnL9owIDl4B7LuMeosgVcusHzx9hykxPVwRfNauVy68="
source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v3.1.1"
digest = "8P5eQMZxig/1Ix7oOZ7NO7c5yKdKXVd6Zu8cPQW9MTI="
4 changes: 2 additions & 2 deletions Twoliter.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
schema-version = 1
release-version = "1.26.0"
release-version = "1.26.1"

[vendor.bottlerocket]
registry = "public.ecr.aws/bottlerocket"
Expand All @@ -11,5 +11,5 @@ vendor = "bottlerocket"

[[kit]]
name = "bottlerocket-core-kit"
version = "3.1.0"
version = "3.1.1"
vendor = "bottlerocket"

0 comments on commit 943d9a4

Please sign in to comment.