You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2022/07/08 07:21:41 UTC

[cassandra] branch trunk updated (b29ad8823a -> 481fdde885)

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

bereng pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


    from b29ad8823a Merge branch cassandra-4.1 into trunk
     new f77a7a29e8 Update the CQL version for the 4.1 release
     new 481fdde885 Merge branch 'cassandra-4.1' into trunk

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                                             |  2 +-
 doc/modules/cassandra/pages/cql/changes.adoc           | 10 ++++++++++
 doc/modules/cassandra/pages/new/virtualtables.adoc     |  4 ++--
 src/java/org/apache/cassandra/cql3/QueryProcessor.java |  2 +-
 4 files changed, 14 insertions(+), 4 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-4.1' into trunk

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

bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 481fdde885e971733c1e72513b3ada90a6392cc1
Merge: b29ad8823a f77a7a29e8
Author: Bereng <be...@gmail.com>
AuthorDate: Fri Jul 8 09:19:49 2022 +0200

    Merge branch 'cassandra-4.1' into trunk

 README.asc                                             |  2 +-
 doc/modules/cassandra/pages/cql/changes.adoc           | 10 ++++++++++
 doc/modules/cassandra/pages/new/virtualtables.adoc     |  4 ++--
 src/java/org/apache/cassandra/cql3/QueryProcessor.java |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --cc README.asc
index 942bb203b0,f484aa277e..cba3a2b424
--- a/README.asc
+++ b/README.asc
@@@ -39,7 -39,7 +39,7 @@@ be sitting in front of a prompt
  
  ----
  Connected to Test Cluster at localhost:9160.
- [cqlsh 6.2.0 | Cassandra 4.2-SNAPSHOT | CQL spec 3.4.5 | Native protocol v5]
 -[cqlsh 6.0.0 | Cassandra 4.1 | CQL spec 3.4.6 | Native protocol v5]
++[cqlsh 6.2.0 | Cassandra 4.2-SNAPSHOT | CQL spec 3.4.6 | Native protocol v5]
  Use HELP for help.
  cqlsh>
  ----


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