This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 47fe3a12cff44c10efed584b70f6b43318a82b91 Merge: b4087b7f5b c91ffe8a9f Author: Caleb Rackliffe <[email protected]> AuthorDate: Thu Aug 15 10:55:40 2024 -0500 Merge branch 'cassandra-5.0.0' into cassandra-5.0 * cassandra-5.0.0: Use default commitlog settings in test YAMLs CHANGES.txt | 2 ++ test/conf/cassandra-mtls-backward-compatibility.yaml | 3 ++- test/conf/cassandra-mtls.yaml | 3 ++- test/conf/cassandra-murmur.yaml | 3 ++- test/conf/cassandra-old.yaml | 3 ++- test/conf/cassandra-pem-jks-sslcontextfactory.yaml | 3 ++- ...assandra-pem-sslcontextfactory-invalidconfiguration.yaml | 3 ++- ...ssandra-pem-sslcontextfactory-mismatching-passwords.yaml | 3 ++- .../cassandra-pem-sslcontextfactory-unencryptedkeys.yaml | 3 ++- test/conf/cassandra-pem-sslcontextfactory.yaml | 3 ++- test/conf/cassandra-seeds.yaml | 3 ++- .../cassandra-sslcontextfactory-invalidconfiguration.yaml | 3 ++- test/conf/cassandra-sslcontextfactory.yaml | 3 ++- test/conf/cassandra.yaml | 3 ++- test/conf/unit-test-conf/test-native-port.yaml | 3 ++- .../apache/cassandra/distributed/impl/InstanceConfig.java | 3 ++- .../distributed/test/ReplicaFilteringProtectionTest.java | 3 +-- .../org/apache/cassandra/simulator/ClusterSimulation.java | 13 ++++++++++++- .../cassandra/config/FailStartupDuplicateParamsTest.java | 3 ++- .../config/LoadOldYAMLBackwardCompatibilityTest.java | 2 +- .../apache/cassandra/config/ParseAndConvertUnitsTest.java | 2 +- test/unit/org/apache/cassandra/cql3/CQLTester.java | 11 ++++++++--- .../apache/cassandra/db/commitlog/CommitLogReaderTest.java | 9 ++++++++- 23 files changed, 65 insertions(+), 25 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
