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 4f32cdbf7c24f35b494bf093e1c6b0827f3e2519 Merge: 046b2e8465 e1355d7238 Author: Stefan Miklosovic <[email protected]> AuthorDate: Thu Nov 16 08:41:51 2023 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + NEWS.txt | 2 ++ conf/cassandra.yaml | 17 +++++++++++++++++ src/java/org/apache/cassandra/config/Config.java | 2 +- test/conf/cassandra-mtls-backward-compatibility.yaml | 2 +- test/conf/cassandra-mtls.yaml | 2 +- test/conf/cassandra-murmur.yaml | 2 +- test/conf/cassandra-old.yaml | 2 +- test/conf/cassandra-pem-jks-sslcontextfactory.yaml | 2 +- ...ndra-pem-sslcontextfactory-invalidconfiguration.yaml | 2 +- ...dra-pem-sslcontextfactory-mismatching-passwords.yaml | 2 +- ...cassandra-pem-sslcontextfactory-unencryptedkeys.yaml | 2 +- test/conf/cassandra-pem-sslcontextfactory.yaml | 2 +- test/conf/cassandra-seeds.yaml | 2 +- ...assandra-sslcontextfactory-invalidconfiguration.yaml | 2 +- test/conf/cassandra-sslcontextfactory.yaml | 2 +- test/conf/cassandra.yaml | 2 +- test/conf/unit-test-conf/test-native-port.yaml | 2 +- 18 files changed, 35 insertions(+), 15 deletions(-) diff --cc CHANGES.txt index 7c8a48ad03,5102f80bff..72ea51472c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -5.0-beta1 +5.1 + * Add ELAPSED command to cqlsh (CASSANDRA-18861) + * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Set default disk_access_mode to mmap_index_only (CASSANDRA-19021) * Exclude net.java.dev.jna:jna dependency from dependencies of org.caffinitas.ohc:ohc-core (CASSANDRA-18992) * Add UCS sstable_growth and min_sstable_size options (CASSANDRA-18945) * Make cqlsh's min required Python version 3.7+ instead of 3.6+ (CASSANDRA-18960) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
