You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ed...@apache.org on 2021/05/17 13:15:25 UTC
[cassandra] branch trunk updated (8a507d0 -> 9422d92)
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 8a507d0 Merge branch cassandra-4.0 into trunk
add 326d61e Remove drivers dependency and bring cql_keywords_reserved on server side authored and reviewed by Ekaterina Dimitrova, Adam Holmberg and Andres de la Pena for CASSANDRA-16659
new 9422d92 Merge branch 'cassandra-4.0' into trunk
The 1 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:
CHANGES.txt | 1 +
pylib/cqlshlib/cqlhandling.py | 19 +++--
pylib/cqlshlib/test/basecase.py | 16 ++--
pylib/cqlshlib/test/cassconnect.py | 5 +-
pylib/cqlshlib/test/run_cqlsh.py | 3 +-
pylib/cqlshlib/test/test_constants.py | 38 +++++++++
src/antlr/Lexer.g | 3 +-
.../apache/cassandra/cql3/ReservedKeywords.java | 90 +++++++---------------
.../apache/cassandra/cql3/reserved_keywords.txt | 57 ++++++++++++++
.../cassandra/cql3/ReservedKeywordsTest.java | 2 +-
10 files changed, 155 insertions(+), 79 deletions(-)
create mode 100644 pylib/cqlshlib/test/test_constants.py
create mode 100644 src/resources/org/apache/cassandra/cql3/reserved_keywords.txt
---------------------------------------------------------------------
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.0' into trunk
Posted by ed...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 9422d92603591002d9d928e68832019512792244
Merge: 8a507d0 326d61e
Author: Ekaterina Dimitrova <ek...@datastax.com>
AuthorDate: Mon May 17 09:10:33 2021 -0400
Merge branch 'cassandra-4.0' into trunk
CHANGES.txt | 1 +
pylib/cqlshlib/cqlhandling.py | 19 +++--
pylib/cqlshlib/test/basecase.py | 16 ++--
pylib/cqlshlib/test/cassconnect.py | 5 +-
pylib/cqlshlib/test/run_cqlsh.py | 3 +-
pylib/cqlshlib/test/test_constants.py | 38 +++++++++
src/antlr/Lexer.g | 3 +-
.../apache/cassandra/cql3/ReservedKeywords.java | 90 +++++++---------------
.../apache/cassandra/cql3/reserved_keywords.txt | 57 ++++++++++++++
.../cassandra/cql3/ReservedKeywordsTest.java | 2 +-
10 files changed, 155 insertions(+), 79 deletions(-)
diff --cc CHANGES.txt
index 9ec0f98,4ca461d..a9f4681
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
-4.0-rc2
+4.1
+ * GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651)
+Merged from 4.0:
+ * Remove drivers dependency and bring cql_keywords_reserved on server side (CASSANDRA-16659)
* Fix in-browser "help", Python 3 (CASSANDRA-16658)
* Fix DROP COMPACT STORAGE for counters (CASSANDRA-16653)
* Add back validation for AlterTableStatements (CASSANDRA-16643)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org