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 <berenguerbl...@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-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
