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

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

commit 85ca91fd64fb068c53f21d74d1f0cf8ed889c59b
Merge: 10f66d5ccb 042c657c42
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Fri Mar 28 11:08:58 2025 +0100

    Merge branch 'cassandra-4.1' into cassandra-5.0
    
    * cassandra-4.1:
      Fix comment in BigFormat wrt when nb was introduced

 src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java
index d188638669,b55b4a00cf..46f8a3bf2b
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java
@@@ -351,17 -132,12 +351,17 @@@ public class BigFormat extends Abstract
          // me (3.0.25, 3.11.11): added hostId of the node from which the 
sstable originated
  
          // na (4.0-rc1): uncompressed chunks, pending repair session, 
isTransient, checksummed sstable metadata file, new Bloomfilter format
-         // nb (4.0.0): originating host id
+         // nb (4.0-rc2): originating host id
 +        // oa (5.0): improved min/max, partition level deletion presence 
marker, key range (CASSANDRA-18134)
 +        //           Long deletionTime to prevent TTL overflow
 +        //           token space coverage
          //
 -        // NOTE: when adding a new version, please add that to 
LegacySSTableTest, too.
 +        // NOTE: When adding a new version:
 +        //  - Please add it to LegacySSTableTest
 +        //  - Please maybe add it to hasOriginatingHostId's regexp
  
          private final boolean isLatestVersion;
 -        public final int correspondingMessagingVersion;
 +        private final int correspondingMessagingVersion;
          private final boolean hasCommitLogLowerBound;
          private final boolean hasCommitLogIntervals;
          private final boolean hasAccurateMinMax;


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

Reply via email to