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

adelapena pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 45982f5617565f31e7d634ca9d1d2b6b55c3b775
Merge: 34dde96 0700dfa
Author: Andrés de la Peña <[email protected]>
AuthorDate: Tue Oct 13 15:47:20 2020 +0100

    Merge branch 'cassandra-3.0' into cassandra-3.11
    
    # Conflicts:
    #   CHANGES.txt

 CHANGES.txt                                                      | 1 +
 .../apache/cassandra/cql3/statements/AlterTableStatement.java    | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --cc CHANGES.txt
index ee70af5,0f9694e..98c23c5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,8 +1,11 @@@
 -3.0.23:
 +3.11.9
 + * Fix memory leak in CompressedChunkReader (CASSANDRA-15880)
 + * Don't attempt value skipping with mixed version cluster (CASSANDRA-15833)
 + * Avoid failing compactions with very large partitions (CASSANDRA-15164)
 + * Make sure LCS handles duplicate sstable added/removed notifications 
correctly (CASSANDRA-14103)
 +Merged from 3.0:
+  * Check SSTables for latest version before dropping compact storage 
(CASSANDRA-16063)
   * Handle unexpected columns due to schema races (CASSANDRA-15899)
 - * Avoid failing compactions with very large partitions (CASSANDRA-15164)
 - * Use IF NOT EXISTS for index and UDT create statements in snapshot schema 
files (CASSANDRA-13935)
   * Add flag to ignore unreplicated keyspaces during repair (CASSANDRA-15160)
  Merged from 2.2:
   * Fixed a NullPointerException when calling nodetool enablethrift 
(CASSANDRA-16127)


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

Reply via email to