You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2024/04/03 22:02:46 UTC
(cassandra) branch trunk updated (b37f47b3ee -> 2944d77aac)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from b37f47b3ee Merge branch 'cassandra-5.0' into trunk
new 338e4ed618 Docs: deprecate the usage of apt-key and adopt distribution name
new f0aa6744d2 Merge branch 'cassandra-3.11' into cassandra-4.0
new 7cbf59e9a1 Merge branch 'cassandra-4.0' into cassandra-4.1
new 973aad7b68 Merge branch 'cassandra-4.1' into cassandra-5.0
new 2944d77aac Merge branch 'cassandra-5.0' into trunk
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
doc/modules/cassandra/examples/BASH/add_repo_keys.sh | 2 +-
doc/modules/cassandra/examples/BASH/get_deb_package.sh | 4 ++--
doc/modules/cassandra/partials/package_versions.adoc | 11 +++++------
3 files changed, 8 insertions(+), 9 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2944d77aac0e75cdc424641dbd3b7364ca72fae3
Merge: b37f47b3ee 973aad7b68
Author: Brandon Williams <br...@apache.org>
AuthorDate: Wed Apr 3 17:01:48 2024 -0500
Merge branch 'cassandra-5.0' into trunk
doc/modules/cassandra/examples/BASH/add_repo_keys.sh | 2 +-
doc/modules/cassandra/examples/BASH/get_deb_package.sh | 4 ++--
doc/modules/cassandra/partials/package_versions.adoc | 11 +++++------
3 files changed, 8 insertions(+), 9 deletions(-)
diff --cc doc/modules/cassandra/examples/BASH/get_deb_package.sh
index 8c1b07bb1e,a1d64eaf0a..96ebb44ae5
--- 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 42x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list
- deb https://debian.cassandra.apache.org 42x main
-$ echo "deb [signed-by=/etc/apt/keyrings/apache-cassandra.asc] https://debian.cassandra.apache.org 50x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list
-deb https://debian.cassandra.apache.org 50x main
++$ echo "deb [signed-by=/etc/apt/keyrings/apache-cassandra.asc] https://debian.cassandra.apache.org 51x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list
++deb https://debian.cassandra.apache.org 51x main
diff --cc doc/modules/cassandra/partials/package_versions.adoc
index 17ca41dce3,4457d7ae19..44233bc992
--- a/doc/modules/cassandra/partials/package_versions.adoc
+++ b/doc/modules/cassandra/partials/package_versions.adoc
@@@ -1,9 -1,8 +1,8 @@@
- The latest major version is {40_version} and the corresponding distribution name is `40x` (with an "x" as the suffix).
-The latest major version is {50_version} and the corresponding distribution name is `50x` (with an "x" as the suffix).
++The latest major version is {51_version} and the corresponding distribution name is `51x` (with an "x" as the suffix).
For older releases use:
- * `311x` for C* {3x_version} series
- * `30x` for {30_version}
- * `22x` for {22_version}
- * `21x` for {21_version}
++* `51x` for C* {51_version} series
+ * `50x` for C* {50_version} series
+ * `41x` for C* {41_version} series
-* `40x` for C* {40_version} series
- For example, to add the repository for version {40_version} (`40x`):
-For example, to add the repository for version {50_version} (`50x`):
++For example, to add the repository for version {51_version} (`51x`):
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org