You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by ed...@apache.org on 2022/02/25 21:11:45 UTC

[cassandra] 01/02: Merge branch 'cassandra-4.0' into trunk

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

edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 75bea27e5ef673ae7fcfac9007c1d39a68ab0b8c
Merge: 12e2c15 a8b67e3
Author: Ekaterina Dimitrova <ek...@datastax.com>
AuthorDate: Fri Feb 25 15:47:43 2022 -0500

    Merge branch 'cassandra-4.0' into trunk

 .../db/streaming/CassandraIncomingFile.java        |  2 +-
 .../apache/cassandra/io/sstable/SSTableLoader.java |  5 ++
 .../io/sstable/format/RangeAwareSSTableWriter.java |  4 +-
 .../format/RangeAwareSSTableWriterTest.java        | 91 ++++++++++++++++++++++
 4 files changed, 99 insertions(+), 3 deletions(-)


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