Skip to content

Commit 943d9a4

Browse files
authored
Merge pull request #4265 from ginglis13/backport-1.26.1
Prepare 1.26.x branch for 1.26.1 release
2 parents 85f0d68 + 4e67c8e commit 943d9a4

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# v1.26.1 (2024-10-24)
2+
3+
## Release Highlights
4+
* 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))
5+
6+
## Build Changes
7+
8+
### OS Changes
9+
* Update bottlerocket-core-kit to 3.1.1 ([#4264])
10+
11+
[#4264]: https://github.com/bottlerocket-os/bottlerocket/pull/4264
12+
113
# v1.26.0 (2024-10-23)
214

315
## Release Highlights

Release.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "1.26.0"
1+
version = "1.26.1"
22

33
[migrations]
44
"(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"]
@@ -366,3 +366,4 @@ version = "1.26.0"
366366
"migrate_v1.25.0_public-control-container-v0-7-17.lz4",
367367
]
368368
"(1.25.0, 1.26.0)" = []
369+
"(1.26.0, 1.26.1)" = []

Twoliter.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ digest = "V2lUX6Rs9rZLg8POxV7P785Mr5nallfyxor0Scrvh3Y="
99

1010
[[kit]]
1111
name = "bottlerocket-core-kit"
12-
version = "3.1.0"
12+
version = "3.1.1"
1313
vendor = "bottlerocket"
14-
source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v3.1.0"
15-
digest = "tnL9owIDl4B7LuMeosgVcusHzx9hykxPVwRfNauVy68="
14+
source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v3.1.1"
15+
digest = "8P5eQMZxig/1Ix7oOZ7NO7c5yKdKXVd6Zu8cPQW9MTI="

Twoliter.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
schema-version = 1
2-
release-version = "1.26.0"
2+
release-version = "1.26.1"
33

44
[vendor.bottlerocket]
55
registry = "public.ecr.aws/bottlerocket"
@@ -11,5 +11,5 @@ vendor = "bottlerocket"
1111

1212
[[kit]]
1313
name = "bottlerocket-core-kit"
14-
version = "3.1.0"
14+
version = "3.1.1"
1515
vendor = "bottlerocket"

0 commit comments

Comments
 (0)