Resolve merge conflict with main: add v24.3.30, v25.2.16, and v25.4.7 entries

Author: taroface

src/current/_data/cards.yml

@@ -15,7 +15,7 @@ develop:
   - link: "/PREFIX/schema-design-overview.html"
     title: "Design a schema"
     text: "Details and best practices about designing schemas for your data."
-  - link: "/PREFIX/insert-data.html"
+  - link: "/PREFIX/insert.html"
     title: "Write data"
     text: "How to insert data into your cluster."
   - link: "/PREFIX/query-behavior-troubleshooting.html"

src/current/_data/redirects.yml

@@ -1120,4 +1120,32 @@
 
 - destination: reads-and-writes-overview.md
   sources: ['query-data.md']
+  versions: ['v26.1', 'v26.2']
+
+- destination: delete.md
+  sources: ['delete-data.md']
+  versions: ['v26.1', 'v26.2']
+
+- destination: configure-replication-zones.md
+  sources: ['demo-automatic-cloud-migration.md']
+  versions: ['v26.1', 'v26.2']
+
+- destination: jsonb.md
+  sources: ['demo-json-support.md']
+  versions: ['v26.1', 'v26.2']
+
+- destination: query-spatial-data.md
+  sources: ['export-spatial-data.md']
+  versions: ['v26.1', 'v26.2']
+
+- destination: insert.md
+  sources: ['insert-data.md']
+  versions: ['v26.1', 'v26.2']
+
+- destination: spatial-data-overview.md
+  sources: ['spatial-tutorial.md', 'geoserver.md']
+  versions: ['v26.1', 'v26.2']
+
+- destination: update.md
+  sources: ['update-data.md']
   versions: ['v26.1', 'v26.2']

src/current/_data/releases.yml

@@ -10978,6 +10978,75 @@
   source: true
   previous_release: v26.2.0-beta.1
 
+- release_name: v24.3.30
+  major_version: v24.3
+  release_date: '2026-04-03'
+  release_type: Production
+  go_version: go1.25.5
+  sha: 13a49ec6fffa7c5dd238c9cf191757358715b790
+  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).
+
+
+- release_name: v25.2.16
+  major_version: v25.2
+  release_date: '2026-04-03'
+  release_type: Production
+  go_version: go1.25.5
+  sha: 35d38b157507ca53438484aa05b6145f9320aeed
+  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: v25.2.15
+  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).
+
 
 - release_name: v25.4.7
   major_version: v25.4

src/current/_includes/cockroachcloud/app/see-also-links.md

@@ -4,4 +4,3 @@ You might also be interested in the following pages:
 - [Data Replication]({% link {{site.current_cloud_version}}/demo-data-replication.md %})
 - [CockroachDB Resilience]({% link {{site.current_cloud_version}}/demo-cockroachdb-resilience.md %})
 - [Automatic Rebalancing]({% link {{site.current_cloud_version}}/demo-automatic-rebalancing.md %})
-- [Cross-Cloud Migration]({% link {{site.current_cloud_version}}/demo-automatic-cloud-migration.md %})

src/current/_includes/releases/v24.3/v24.3.30.md

@@ -0,0 +1,14 @@
+## 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 an `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]
+
+
+[#164888]: https://github.com/cockroachdb/cockroach/pull/164888
+[#165571]: https://github.com/cockroachdb/cockroach/pull/165571

src/current/_includes/releases/v25.2/v25.2.16.md

@@ -0,0 +1,13 @@
+## v25.2.16
+
+Release Date: April 3, 2026
+
+{% include releases/new-release-downloads-docker-image.md release=include.release %}
+
+<h3 id="v25-2-16-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 an `ON` filter that is mostly `false`. [#164889][#164889]
+- 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. [#165570][#165570]
+
+[#164889]: https://github.com/cockroachdb/cockroach/pull/164889
+[#165570]: https://github.com/cockroachdb/cockroach/pull/165570

src/current/_includes/releases/v26.2/v26.2.0-beta.2.md

@@ -0,0 +1,30 @@
+## v26.2.0-beta.2
+
+Release Date: April 1, 2026
+
+{% include releases/new-release-downloads-docker-image.md release=include.release %}
+
+<h3 id="v26-2-0-beta-2-sql-language-changes">SQL language changes</h3>
+
+- `EXPLAIN` and `EXPLAIN ANALYZE` now display a `table stats mode` field (`canary` or `stable`) when the `sql.stats.canary_fraction` cluster setting is greater than 0, indicating which table statistics were used for query planning. Scan nodes for tables with active canary stats also show the configured canary window duration. [#166129][#166129]
+
+<h3 id="v26-2-0-beta-2-operational-changes">Operational changes</h3>
+
+- A new cluster setting, `server.gc_assist.enabled`, allows operators to dynamically disable GC assist in CockroachDB's forked Go runtime. By default, it follows the `GODEBUG=gcnoassist` flag. A new metric, `sys.gc.assist.enabled`, reports the current state (`1` = enabled, `0` = disabled). [#166555][#166555]
+
+<h3 id="v26-2-0-beta-2-bug-fixes">Bug fixes</h3>
+
+- Fixed a bug where running `EXPLAIN ANALYZE (DEBUG)` on a query that invokes a UDF with many blocks could cause out-of-memory errors (OOMs). [#166132][#166132]
+- Fixed a bug where restoring a database backup containing default privileges that referenced non-existent users would leave dangling user references in the restored database descriptor. [#166183][#166183]
+- Fixed a bug where rolling back a `CREATE TABLE` that referenced user-defined types or sequences would leave orphaned back-references on the type and sequence descriptors, causing them to appear in `crdb_internal.invalid_objects` after the table was GC'd. [#166223][#166223]
+- Fixed a bug where concurrent updates to a table using multiple column families during a partial index creation could result in data loss, incorrect `NULL` values, or validation failures in the resulting index. [#166325][#166325]
+- Fixed a crash (`traceRegion: alloc too large`) that could occur when Go's execution tracer was enabled and a range cache lookup used a key longer than about 64 KB. [#166705][#166705]
+
+
+[#166132]: https://github.com/cockroachdb/cockroach/pull/166132
+[#166183]: https://github.com/cockroachdb/cockroach/pull/166183
+[#166223]: https://github.com/cockroachdb/cockroach/pull/166223
+[#166325]: https://github.com/cockroachdb/cockroach/pull/166325
+[#166705]: https://github.com/cockroachdb/cockroach/pull/166705
+[#166129]: https://github.com/cockroachdb/cockroach/pull/166129
+[#166555]: https://github.com/cockroachdb/cockroach/pull/166555