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 <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
