Merge branch 'main' into REL-1518

src/current/_includes/releases/new-release-downloads-docker-image.md

@@ -8,12 +8,15 @@
 {% include releases/experimental-test-release.md version=release.release_name %}
 {% endif %}
 
-{% if release.withdrawn == true %}
-{% include releases/withdrawn.md %}
-{% elsif release.cloud_only == true %} {% comment %}Show the Cloud-first info instead of download links {% endcomment %}
+{% comment %}No downloads for Cloud-first or withdrawn releases{% endcomment %}
+{% if release.cloud_only == true %} {% comment %}Show the Cloud-first info instead of download links {% endcomment %}
 {{site.data.alerts.callout_info}}
 {{ r.cloud_only_message }}
 {{site.data.alerts.end}}
+{% elsif release.withdrawn == true % %}{% comment %}If not withdrawn and not Cloud-only, show download links{% endcomment %}
+
+ {% include releases/withdrawn.md %}
+
 {% else %}
 
 {{site.data.alerts.callout_info}}
@@ -25,7 +28,7 @@ Experimental downloads are not qualified for production use and not eligible for
  {% capture onclick_string %}onclick="{{ experimental_download_js }}"{% endcapture %}
  {% capture linux_arm_button_text_addendum %}{% if r.linux.linux_arm_experimental == true %}<br />(Experimental){% endif %}{% if r.linux.linux_arm_limited_access == true %}<br />(Limited Access){% endif %}{% endcapture %}
 
-<div><div class="os-tabs filters clearfix">
+<div><div class="clearfix">
 
 <table style="max-width: 90%;">
  <thead>
@@ -95,9 +98,9 @@ docker pull {{ release.docker.docker_image }}:{{ release.release_name }}
 
 To view or download the source code for CockroachDB {{ release.release_name }} on Github, visit <a target="_blank" rel="noopener" href="https:/cockroachdb/cockroach/releases/tag/{{ release.release_name }}">{{ release.release_name }} source tag</a>.
 
- {% if release.previous_release %}
+{% endif %}
+
+{% if release.previous_release %}
 <h3 id="{{ release.release_name | downcase | replace: ".", "-" }}-changelog">Changelog</h3>
 View a detailed changelog on GitHub: [{{ release.previous_release }}...{{ release.release_name }}](https:/cockroachdb/cockroach/compare/{{ release.previous_release }}...{{ release.release_name }})
- {% endif %}
-
 {% endif %}

src/current/_includes/releases/v24.2/v24.2.1.md

@@ -3,6 +3,7 @@
 Release Date: September 5, 2024
 
 {% include releases/new-release-downloads-docker-image.md release=include.release %}
+
 <h3 id="v24-2-1-security-updates">Security updates</h3>
 
 - The new cluster setting `server.jwt_authentication.issuers.configuration` is now aliased to [`server.jwt_authentication.issuers`]({% link v24.2/sso-sql.md %}#cluster-settings). The new cluster setting reflects the value the setting can take. The setting can now take multiple values to support various kinds of providers and their mapped JWKS URIs. This can be set to one of the following values:
@@ -21,7 +22,7 @@ Release Date: September 5, 2024
 
 - The cluster setting [`storage.ingestion.value_blocks.enabled`]({% link v24.2/cluster-settings.md %}#setting-storage-ingestion-value-blocks-enabled) can be set to `false` if a pathological huge [range]({% link v24.2/architecture/glossary.md %}#range) happens to occur in a cluster, and incoming [snapshots]({% link v24.2/architecture/replication-layer.md %}#snapshots) of that range are causing [OOMs]({% link v24.2/cluster-setup-troubleshooting.md %}#out-of-memory-oom-crash). [#128098][#128098]
 - Two new structured logging events report connection breakage during node shutdown. Previously, these logs existed but were unstructured. These logs appear in the [`OPS` logging channel]({% link v24.2/logging.md %}#ops).
- - The [`node_shutdown_connection_timeout`]({% link v24.2/eventlog.md %}#node_shutdown_connection_timeout) event is logged after the timeout defined by [`server.shutdown.connections.timeout`]({% link v24.2/cluster-settings.md %}#setting-server-shutdown-connection-wait) transpires, if there are still [open SQL connections]({% link v24.2/show-sessions.md %}). 
+ - The [`node_shutdown_connection_timeout`]({% link v24.2/eventlog.md %}#node_shutdown_connection_timeout) event is logged after the timeout defined by [`server.shutdown.connections.timeout`]({% link v24.2/cluster-settings.md %}#setting-server-shutdown-connection-wait) transpires, if there are still [open SQL connections]({% link v24.2/show-sessions.md %}).
  - The [`node_shutdown_transaction_timeout`]({% link v24.2/eventlog.md %}#node_shutdown_transaction_timeout) event is logged after the timeout defined by [`server.shutdown.transactions.timeout`]({% link v24.2/cluster-settings.md %}#setting-server-shutdown-query-wait) transpires, if there are still open [transactions]({% link v24.2/transactions.md %}) on those SQL connections. [#128712][#128712]
 
 <h3 id="v24-2-1-db-console-changes">DB Console changes</h3>
@@ -62,4 +63,4 @@ Release Date: September 5, 2024
 [#128825]: https:/cockroachdb/cockroach/pull/128825
 [#128837]: https:/cockroachdb/cockroach/pull/128837
 [#128891]: https:/cockroachdb/cockroach/pull/128891
-[#129094]: https:/cockroachdb/cockroach/pull/129094
+[#129094]: https:/cockroachdb/cockroach/pull/129094

src/current/_includes/releases/withdrawn.md

@@ -1,5 +1,3 @@
-{% if release.withdrawn == "true" %}
 {{site.data.alerts.callout_danger}}
 This patch release has been withdrawn{% if include.advisory_key %} due to [this technical advisory](https://www.cockroachlabs.com/docs/advisories/{{ include.advisory_key }}){% endif %}. We've removed the links to the downloads and Docker image.All the changes listed as part of this release will be in the next release. Do not upgrade to this release.
 {{site.data.alerts.end}}
-{% endif %}

src/current/advisories/a131639.md

@@ -87,9 +87,11 @@ For example, if you suspect that a row in `my_table` with primary key `pk=1` and
 
 {% include_cached copy-clipboard.html %}
 ~~~ sql
-SELECT count(*) FROM my_table@my_table_pkey WHERE pk = 1 AS OF SYSTEM TIME '-10s';
-SELECT count(*) FROM my_table@my_table_a_idx WHERE pk = 1 AND a=2 AS OF SYSTEM TIME '-10s';
-SELECT count(*) FROM my_table@my_table_b_idx WHERE pk = 1 AND b=3 AS OF SYSTEM TIME '-10s';
+BEGIN AS OF SYSTEM TIME '-10s';
+SELECT count(*) FROM my_table@my_table_pkey WHERE pk = 1;
+SELECT count(*) FROM my_table@my_table_a_idx WHERE pk = 1;
+SELECT count(*) FROM my_table@my_table_b_idx WHERE pk = 1;
+COMMIT;
 ~~~
 
 If any of these queries return different values for `count`, that likely indicates a lost write.