You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2020/11/02 10:40:37 UTC

[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11

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

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

commit 833ba83c155871247092d6783d026c27582cde7b
Merge: a32881e f106ef0
Author: Sylvain Lebresne <le...@gmail.com>
AuthorDate: Mon Nov 2 11:37:43 2020 +0100

    Merge branch 'cassandra-3.0' into cassandra-3.11

 CHANGES.txt                                                 |  2 ++
 .../apache/cassandra/cql3/statements/SelectStatement.java   | 13 ++++++++++---
 .../cassandra/cql3/validation/ThriftIntegrationTest.java    |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --cc CHANGES.txt
index b4caada,80f5d58..2501fcb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,13 @@@
 +3.11.9
 + * Synchronize Keyspace instance store/clear (CASSANDRA-16210)
 + * Fix ColumnFilter to avoid querying cells of unselected complex columns (CASSANDRA-15977)
 + * 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:
+ 3.0.23:
+  * Fix invalid cell value skipping when reading from disk (CASSANDRA-16223)
   * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
   * Fix OOM when terminating repair session (CASSANDRA-15902)
   * Avoid marking shutting down nodes as up after receiving gossip shutdown message (CASSANDRA-16094)


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