This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 881bb56be7d49ccc16589fd56eb77396c0f267f9 Merge: d707bb98b4 7b89b6018d Author: Stefan Miklosovic <[email protected]> AuthorDate: Wed Aug 9 21:00:49 2023 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + NEWS.txt | 1 + conf/cassandra.yaml | 4 - .../pages/architecture/storage-engine.adoc | 8 +- src/java/org/apache/cassandra/config/Config.java | 5 - .../cassandra/config/DatabaseDescriptor.java | 4 - .../cassandra-mtls-backward-compatibility.yaml | 1 - test/conf/cassandra-mtls.yaml | 1 - test/conf/cassandra-murmur.yaml | 1 - test/conf/cassandra-old.yaml | 1 - test/conf/cassandra-seeds.yaml | 1 - ...dra-sslcontextfactory-invalidconfiguration.yaml | 1 - test/conf/cassandra-sslcontextfactory.yaml | 1 - test/conf/cassandra.yaml | 1 - test/conf/unit-test-conf/test-native-port.yaml | 1 - test/data/config/version=5.0-alpha1.yml | 474 +++++++++++++++++++++ .../cassandra/distributed/impl/InstanceConfig.java | 4 +- .../distributed/test/RepairBoundaryTest.java | 1 - .../cassandra/distributed/test/RepairTest.java | 1 - .../upgrade/ConfigCompatibilityTestGenerate.java | 7 +- .../cassandra/config/ConfigCompatibilityTest.java | 19 +- 21 files changed, 501 insertions(+), 37 deletions(-) diff --cc CHANGES.txt index df38dc8f6a,99bb77aee3..697244db1c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,7 +1,17 @@@ -5.0 +5.1 +Merged from 5.0: + * Remove commitlog_sync_batch_window_in_ms (CASSANDRA-17161) * Upgrade JMH from 1.21 to 1.36 (CASSANDRA-18696) * Add guardrail for vector dimensions (CASSANDRA-18730) +Merged from 4.1: +Merged from 4.0: +Merged from 3.11: +Merged from 3.0: + * Fix CQLSH online help topic link (CASSANDRA-17534) + * Remove unused suppressions (CASSANDRA-18724) + + +5.0 * Upgraded Netty to 4.1.96, added BouncyCastle dependency (CASSANDRA-17992) * Fix for (unsupported) big endian unaligned architecture, eg s390x (CASSANDRA-17723) * CIDR filtering authorizer (CASSANDRA-18592) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
