This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit f0aa6744d2390535476a928d666f01482b3b7796
Merge: c73683c1a8 338e4ed618
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Wed Apr 3 16:48:49 2024 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
doc/modules/cassandra/examples/BASH/add_repo_keys.sh | 2 +-
doc/modules/cassandra/examples/BASH/get_deb_package.sh | 2 +-
doc/modules/cassandra/partials/package_versions.adoc | 15 ++++++++++-----
3 files changed, 12 insertions(+), 7 deletions(-)
diff --cc doc/modules/cassandra/examples/BASH/get_deb_package.sh
index 544512280a,ab34c32a98..3512c37c61
--- a/doc/modules/cassandra/examples/BASH/get_deb_package.sh
+++ b/doc/modules/cassandra/examples/BASH/get_deb_package.sh
@@@ -1,2 -1,2 +1,2 @@@
- $ echo "deb https://debian.cassandra.apache.org 40x main" | sudo tee -a
/etc/apt/sources.list.d/cassandra.sources.list
-$ echo "deb [signed-by=/etc/apt/keyrings/apache-cassandra.asc]
https://debian.cassandra.apache.org 311x main" | sudo tee -a
/etc/apt/sources.list.d/cassandra.sources.list
-deb https://debian.cassandra.apache.org 311x main
++$ echo "deb [signed-by=/etc/apt/keyrings/apache-cassandra.asc]
https://debian.cassandra.apache.org 40x main" | sudo tee -a
/etc/apt/sources.list.d/cassandra.sources.list
+deb https://debian.cassandra.apache.org 40x main
diff --cc doc/modules/cassandra/partials/package_versions.adoc
index 12eab03eb5,406ae9cc59..a5c7bfe67c
--- a/doc/modules/cassandra/partials/package_versions.adoc
+++ b/doc/modules/cassandra/partials/package_versions.adoc
@@@ -1,5 -1,10 +1,10 @@@
- The latest major version is {40_version} and the
- corresponding distribution name is `40x` (with an "x" as the suffix).
- For older releases use `311x` for C* {3x_version} series, `30x` for
{30_version}, `22x`
- for {22_version} and `21x` for {21_version}. For example, to add the
repository for
- version {40_version} (`40x`):
-The latest major version is {311_version} and the corresponding distribution
name is `311x` (with an "x" as the suffix).
++The latest major version is {40_version} and the corresponding distribution
name is `40x` (with an "x" as the suffix).
+ For older releases use:
+
++* `40x` for C* {40_version} series
+ * `311x` for C* {311_version} series
+ * `30x` for C* {30_version} series
+ * `22x` for C* {22_version} series
+ * `21x` for C* {21_version} series
-* `20x` for C* {20_version} series
+
-For example, to add the repository for version {311_version} (`311x`):
++For example, to add the repository for version {40_version} (`40x`):
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
