You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2021/05/06 12:51:08 UTC

[cassandra] branch trunk updated (5fc8112 -> 0895099)

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

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


    from 5fc8112  Refactor NodeTool commands tests
     add a867abf  Add back validation for AlterTableStatements
     new 0895099  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 +
 .../cql3/statements/schema/AlterTableStatement.java          |  4 +++-
 src/java/org/apache/cassandra/schema/TableMetadata.java      |  2 +-
 .../cassandra/cql3/validation/entities/CountersTest.java     | 12 ++++++++++++
 4 files changed, 17 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-4.0 into trunk

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

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

commit 089509922e95249310575bdfc8be7c88b811bed4
Merge: 5fc8112 a867abf
Author: Benjamin Lerer <b....@gmail.com>
AuthorDate: Thu May 6 14:33:29 2021 +0200

    Merge branch cassandra-4.0 into trunk

 CHANGES.txt                                                  |  1 +
 .../cql3/statements/schema/AlterTableStatement.java          |  4 +++-
 src/java/org/apache/cassandra/schema/TableMetadata.java      |  2 +-
 .../cassandra/cql3/validation/entities/CountersTest.java     | 12 ++++++++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --cc CHANGES.txt
index ca375f0,0edae1b..2fe9fb0
--- 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:
+  * Add back validation for AlterTableStatements (CASSANDRA-16643)
   * Fix cqlsh encoding error with unicode in multi-line statement (CASSANDRA-16539)
   * Fix race in fat client removal (CASSANDRA-16238)
   * Test org.apache.cassandra.net.AsyncPromiseTest FAILED (CASSANDRA-16596)

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