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 aaf653700febee2b6375a13387afe2dd23a349c3
Merge: d0a05b9 7d4ee38
Author: Benjamin Lerer <[email protected]>
AuthorDate: Fri Jun 11 10:57:30 2021 +0200

    Merge branch cassandra-4.0 into trunk

 CHANGES.txt                                        |   1 +
 .../cassandra/db/SinglePartitionReadCommand.java   |  14 +-
 .../test/SinglePartitionReadCommandTest.java       | 143 +++++
 .../miscellaneous/SSTablesIteratedTest.java        | 632 ++++++++++++++++++++-
 4 files changed, 772 insertions(+), 18 deletions(-)

diff --cc CHANGES.txt
index 637f045,a086d24..2cd9182
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -24,8 -21,9 +24,9 @@@ Merged from 3.11
   * Nodetool garbagecollect should retain SSTableLevel for LCS 
(CASSANDRA-16634)
   * Ignore stale acks received in the shadow round (CASSANDRA-16588)
  Merged from 3.0:
+  * Ensure that existing empty rows are properly returned (CASSANDRA-16671)
   * Failure to execute queries should emit a KPI other than read 
timeout/unavailable so it can be alerted/tracked (CASSANDRA-16581)
 - * Don't wait on schema versions from replacement target when replacing a 
node (CASSANDRA-16692)
 + * Don't wait on schema versions from replacement target when replacing a node
   * StandaloneVerifier does not fail when unable to verify SSTables, it only 
fails if Corruption is thrown (CASSANDRA-16683)
   * Fix bloom filter false ratio calculation by including true negatives 
(CASSANDRA-15834)
   * Prevent loss of commit log data when moving sstables between nodes 
(CASSANDRA-16619)

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

Reply via email to