This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 0a09c12975a8bcbca23255f22e36a8002ecd213b
Merge: 30e0b55f93 0e4c2f4bef
Author: Bereng <berenguerbl...@gmail.com>
AuthorDate: Mon Nov 13 09:27:23 2023 +0100
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Default to nb instead of nc for sstable formats
CASSANDRA-14092.txt | 2 +-
NEWS.txt | 4 +--
conf/cassandra.yaml | 2 +-
conf/jvm-server.options | 4 +--
.../managing/tools/sstable/sstablemetadata.adoc | 2 +-
.../managing/tools/sstable/sstablepartitions.adoc | 34 +++++++++++-----------
.../cassandra/io/sstable/format/SSTableReader.java | 2 +-
.../cassandra/io/sstable/format/Version.java | 4 +--
.../cassandra/io/sstable/format/big/BigFormat.java | 16 +++++-----
.../upgrade/MixedModeTTLOverflowUpgradeTest.java | 12 ++++----
.../test/microbench/DeletionTimeDeSerBench.java | 6 ++--
.../cassandra/io/sstable/LegacySSTableTest.java | 2 +-
.../format/big/VersionSupportedFeaturesTest.java | 6 ++--
.../sstable/metadata/MetadataSerializerTest.java | 5 +++-
14 files changed, 52 insertions(+), 49 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
