This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5fafa709fb3dbcc0c819f67a08027c4ca83a7c14 Merge: 6591048051 b492341eb5 Author: Mick Semb Wever <[email protected]> AuthorDate: Tue Aug 16 21:46:14 2022 +0200 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 | 4 ++-- doc/modules/cassandra/examples/RESULTS/add_yum_repo.result | 2 +- doc/modules/cassandra/pages/getting_started/installing.adoc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --cc doc/modules/cassandra/examples/BASH/get_deb_package.sh index 891bed6427,0b866a8310..544512280a --- 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 http://www.apache.org/dist/cassandra/debian 40x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list - deb http://www.apache.org/dist/cassandra/debian 40x main -$ echo "deb 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 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/examples/RESULTS/add_yum_repo.result index ba06f540f3,47ff95f355..24409f3328 --- a/doc/modules/cassandra/examples/RESULTS/add_yum_repo.result +++ b/doc/modules/cassandra/examples/RESULTS/add_yum_repo.result @@@ -1,6 -1,6 +1,6 @@@ [cassandra] name=Apache Cassandra - baseurl=https://downloads.apache.org/cassandra/redhat/40x/ -baseurl=https://redhat.cassandra.apache.org/311x/ ++baseurl=https://redhat.cassandra.apache.org/40x/ gpgcheck=1 repo_gpgcheck=1 gpgkey=https://downloads.apache.org/cassandra/KEYS diff --cc doc/modules/cassandra/pages/getting_started/installing.adoc index 77e1e6525a,96dbe520a7..c8ddcd0095 --- a/doc/modules/cassandra/pages/getting_started/installing.adoc +++ b/doc/modules/cassandra/pages/getting_started/installing.adoc @@@ -76,7 -72,7 +76,7 @@@ will install the binaries and configura include::example$BASH/docker_pull.sh[] ---- - This `docker pull` command will get the latest version of the official -This `docker pull` command will get the specified version of the 'Docker Official' ++This `docker pull` command will get the latest version of the 'Docker Official' Apache Cassandra image available from the https://hub.docker.com/_/cassandra[Dockerhub]. [arabic, start=2] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
