You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2021/07/13 12:35:52 UTC
[cassandra] branch trunk updated (f9a220c -> 096777d)
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from f9a220c Merge branch 'cassandra-4.0' into trunk
new 2a8e018 Make cqlsh use the same set of reserved keywords than the server uses
new 906781e Merge branch 'cassandra-3.11' into cassandra-4.0
new 096777d Merge branch 'cassandra-4.0' into trunk
The 3 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 | 23 ++++++++++++++---------
pylib/cqlshlib/test/test_constants.py | 7 +++----
src/antlr/Lexer.g | 4 ++--
4 files changed, 20 insertions(+), 15 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.0' into trunk
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 096777d6c637995a227baa46b1df5e3e57e76039
Merge: f9a220c 906781e
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Tue Jul 13 13:25:12 2021 +0100
Merge branch 'cassandra-4.0' into trunk
CHANGES.txt | 1 +
pylib/cqlshlib/cqlhandling.py | 23 ++++++++++++++---------
pylib/cqlshlib/test/test_constants.py | 7 +++----
src/antlr/Lexer.g | 4 ++--
4 files changed, 20 insertions(+), 15 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org