This is an automated email from the ASF dual-hosted git repository. netudima pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit f7bcc1b8e135f8856a4c31f495982f3be0fd3445 Merge: 961f813dac 105694f625 Author: Dmitry Konstantinov <[email protected]> AuthorDate: Sun Jun 21 22:23:20 2026 +0100 Merge branch 'cassandra-6.0' into trunk * cassandra-6.0: Fix TLS-related tests after a JDK update in build image test/conf/cassandra_ssl_test.keystore | Bin 2281 -> 2339 bytes test/conf/cassandra_ssl_test.keystore.pem | 95 +++++++++++---------- test/conf/cassandra_ssl_test.truststore | Bin 8646 -> 8704 bytes test/conf/cassandra_ssl_test.truststore.pem | 41 ++++----- .../cassandra_ssl_test.unencrypted_keystore.pem | 93 ++++++++++---------- test/conf/cassandra_ssl_test_nopassword.keystore | Bin 2517 -> 2624 bytes .../test/SSTableLoaderEncryptionOptionsTest.java | 6 +- .../test/auth/AuthAuditLoggingTest.java | 3 +- 8 files changed, 123 insertions(+), 115 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
