From aa31e370987dbe5e83b7ba5f97521721584758f6 Mon Sep 17 00:00:00 2001
From: Automated Release Bot <releasebot@cockroachlabs.com>
Date: Wed, 1 Apr 2026 11:00:55 +0000
Subject: [PATCH 1/6] Update release notes for v24.3-v24.3.30


From 435f3286008a690200cb46955721bc9e4d26e4ba Mon Sep 17 00:00:00 2001
From: Automated Release Bot <releasebot@cockroachlabs.com>
Date: Wed, 1 Apr 2026 11:00:56 +0000
Subject: [PATCH 2/6] Update release notes for v24.3-v24.3.30

---
 src/current/_data/releases.yml | 35 ++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/current/_data/releases.yml b/src/current/_data/releases.yml
index 1fd3ffed9f3..74f763c2590 100644
--- a/src/current/_data/releases.yml
+++ b/src/current/_data/releases.yml
@@ -10949,3 +10949,38 @@
     docker_arm_limited_access: false
   source: true
   previous_release: v26.2.0-alpha.2
+
+
+- release_name: v24.3.30
+  major_version: v24.3
+  release_date: '2026-04-03'
+  release_type: Production
+  go_version: go1.25.5
+  sha: 6df225aaaada0fb2bec6dd2c61e3f40c003f8914
+  has_sql_only: true
+  has_sha256sum: true
+  mac:
+    mac_arm: true
+    mac_arm_experimental: true
+    mac_arm_limited_access: false
+  windows: true
+  linux:
+    linux_arm: true
+    linux_arm_experimental: false
+    linux_arm_limited_access: false
+    linux_intel_fips: true
+    linux_arm_fips: false
+  docker:
+    docker_image: cockroachdb/cockroach
+    docker_arm: true
+    docker_arm_experimental: false
+    docker_arm_limited_access: false
+  source: true
+  previous_release: v24.3.29
+  cloud_only: true
+  cloud_only_message_short: 'Available only for select CockroachDB Cloud clusters'
+  cloud_only_message: >
+      This version is currently available only for select
+      CockroachDB Cloud clusters. To request to upgrade
+      a CockroachDB self-hosted cluster to this version,
+      [contact support](https://support.cockroachlabs.com/hc/requests/new).

From 463c5c0daa6c2111bedba76186156ffd5f6975d0 Mon Sep 17 00:00:00 2001
From: Automated Release Bot <releasebot@cockroachlabs.com>
Date: Wed, 1 Apr 2026 11:00:57 +0000
Subject: [PATCH 3/6] Update release notes for v24.3-v24.3.30

---
 .../_includes/releases/v24.3/v24.3.30.md      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 src/current/_includes/releases/v24.3/v24.3.30.md

diff --git a/src/current/_includes/releases/v24.3/v24.3.30.md b/src/current/_includes/releases/v24.3/v24.3.30.md
new file mode 100644
index 00000000000..5c68814f5a6
--- /dev/null
+++ b/src/current/_includes/releases/v24.3/v24.3.30.md
@@ -0,0 +1,19 @@
+## v24.3.30
+
+Release Date: April 3, 2026
+
+{% include releases/new-release-downloads-docker-image.md release=include.release %}
+
+<h3 id="v24-3-30-bug-fixes">Bug fixes</h3>
+
+- Fixed a bug where CockroachDB did not always promptly respond to the statement timeout when performing a hash join with `ON` filter that is mostly `false`. [#164888][#164888]
+- Fixed a bug that could cause row sampling for table statistics to crash a node due to a data race when processing a collated string column with values larger than 400 bytes. This bug has existed since before v23.1. [#165571][#165571]
+
+<h3 id="v24-3-30-build-changes">Build changes</h3>
+
+- Replaces bors with Trunk merge queue for better performance and reliability. Configuration-only change with no runtime impact - maintains same safety checks while improving CI workflow. [#165803][#165803]
+
+
+[#164888]: https://github.com/cockroachdb/cockroach/pull/164888
+[#165571]: https://github.com/cockroachdb/cockroach/pull/165571
+[#165803]: https://github.com/cockroachdb/cockroach/pull/165803

From 2bc05a243aa383a1d35a8c5dd07e5755975fe8db Mon Sep 17 00:00:00 2001
From: Automated Release Bot <releasebot@cockroachlabs.com>
Date: Wed, 1 Apr 2026 16:49:50 +0000
Subject: [PATCH 4/6] Update release notes for v24.3-v24.3.30


From 5c75b2b07e1e06696e882353f5942371d92f3ccb Mon Sep 17 00:00:00 2001
From: Automated Release Bot <releasebot@cockroachlabs.com>
Date: Wed, 1 Apr 2026 16:49:51 +0000
Subject: [PATCH 5/6] Update release notes for v24.3-v24.3.30

---
 src/current/_data/releases.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/current/_data/releases.yml b/src/current/_data/releases.yml
index 74f763c2590..3a7be571538 100644
--- a/src/current/_data/releases.yml
+++ b/src/current/_data/releases.yml
@@ -10956,7 +10956,7 @@
   release_date: '2026-04-03'
   release_type: Production
   go_version: go1.25.5
-  sha: 6df225aaaada0fb2bec6dd2c61e3f40c003f8914
+  sha: 13a49ec6fffa7c5dd238c9cf191757358715b790
   has_sql_only: true
   has_sha256sum: true
   mac:

From 93d933a1bf3a178e3692d0e2f1b32198279dfc42 Mon Sep 17 00:00:00 2001
From: Automated Release Bot <releasebot@cockroachlabs.com>
Date: Wed, 1 Apr 2026 16:49:51 +0000
Subject: [PATCH 6/6] Update release notes for v24.3-v24.3.30