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 2021/04/26 13:47:41 UTC

[cassandra] branch cassandra-3.11 updated (9e1b8c0 -> 354b87a)

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 9e1b8c0  Merge branch 'cassandra-3.0' into cassandra-3.11
     new e9cf21b  Update README links
     new 354b87a  Merge branch 'cassandra-3.0' into cassandra-3.11

The 2 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:
 README.asc | 4 ++--
 1 file changed, 2 insertions(+), 2 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-3.0' into cassandra-3.11

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 354b87a0f6a9d7da02645627ae4d21feda1286e5
Merge: 9e1b8c0 e9cf21b
Author: Brandon Williams <br...@apache.org>
AuthorDate: Mon Apr 26 08:46:56 2021 -0500

    Merge branch 'cassandra-3.0' into cassandra-3.11

 README.asc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc README.asc
index 8a6bb48,4c76580..6224b42
--- a/README.asc
+++ b/README.asc
@@@ -1,11 -1,11 +1,11 @@@
 -Executive summary
 +Apache Cassandra
  -----------------
  
 -Cassandra is a partitioned row store.  Rows are organized into tables with a required primary key.
 +Apache Cassandra is a highly-scalable partitioned row store. Rows are organized into tables with a required primary key.
  
- http://wiki.apache.org/cassandra/Partitioners[Partitioning] means that Cassandra can distribute your data across multiple machines in an application-transparent matter. Cassandra will automatically repartition as machines are added and removed from the cluster.
+ https://cwiki.apache.org/confluence/display/CASSANDRA2/Partitioners[Partitioning] means that Cassandra can distribute your data across multiple machines in an application-transparent matter. Cassandra will automatically repartition as machines are added and removed from the cluster.
  
- http://wiki.apache.org/cassandra/DataModel[Row store] means that like relational databases, Cassandra organizes data by rows and columns. The Cassandra Query Language (CQL) is a close relative of SQL.
+ https://cwiki.apache.org/confluence/display/CASSANDRA2/DataModel[Row store] means that like relational databases, Cassandra organizes data by rows and columns. The Cassandra Query Language (CQL) is a close relative of SQL.
  
  For more information, see http://cassandra.apache.org/[the Apache Cassandra web site].
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org