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 2c3c3e639aec8b7515db0e59b606adbea411626a
Merge: abf4738 fb76baa
Author: Andrés de la Peña <[email protected]>
AuthorDate: Fri May 7 17:59:14 2021 +0100

    Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt                                        |  1 +
 .../statements/schema/AlterTableStatement.java     |  8 ++-
 .../cassandra/distributed/test/CountersTest.java   | 78 ++++++++++++++++++++++
 3 files changed, 86 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 2fe9fb0,a424dfc..e89e056
--- 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:
+  * Fix DROP COMPACT STORAGE for counters (CASSANDRA-16653)
   * 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)

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to