You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ed...@apache.org on 2023/06/14 18:21:24 UTC
[cassandra] branch trunk updated (4f5cb2a6fa -> a55d4183f5)
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 4f5cb2a6fa Merge branch 'cassandra-4.1' into trunk
add c37bcbf7e9 Include TLSv1.2 in negotiatedProtocolMustBeAcceptedProtocolTest Add a comment about the use of disabled TLSv1.1 with JDK 8 and higher to negotiatedProtocolMustBeAcceptedProtocolTest
add 622397e7e5 Merge branch 'cassandra-4.0' into cassandra-4.1
new a55d4183f5 Merge branch 'cassandra-4.1' into trunk
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../test/InternodeEncryptionOptionsTest.java | 19 +++++++++++++++----
.../test/NativeTransportEncryptionOptionsTest.java | 17 ++++++++++++++---
2 files changed, 29 insertions(+), 7 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
Posted by ed...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a55d4183f507fab7b254a827af0ee6cc821c5674
Merge: 4f5cb2a6fa 622397e7e5
Author: Ekaterina Dimitrova <ek...@datastax.com>
AuthorDate: Wed Jun 14 14:09:32 2023 -0400
Merge branch 'cassandra-4.1' into trunk
.../test/InternodeEncryptionOptionsTest.java | 19 +++++++++++++++----
.../test/NativeTransportEncryptionOptionsTest.java | 17 ++++++++++++++---
2 files changed, 29 insertions(+), 7 deletions(-)
diff --cc test/distributed/org/apache/cassandra/distributed/test/NativeTransportEncryptionOptionsTest.java
index 5f2caaf695,e5f1a2174a..c8e9de69f0
--- a/test/distributed/org/apache/cassandra/distributed/test/NativeTransportEncryptionOptionsTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/NativeTransportEncryptionOptionsTest.java
@@@ -18,25 -18,14 +18,26 @@@
package org.apache.cassandra.distributed.test;
+import java.io.FileInputStream;
+import java.io.InputStream;
import java.net.InetAddress;
+import java.security.KeyStore;
import java.util.Collections;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.TrustManagerFactory;
+
+ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import com.datastax.driver.core.SSLOptions;
+import com.datastax.driver.core.exceptions.NoHostAvailableException;
+import com.datastax.shaded.netty.handler.ssl.SslContext;
+import com.datastax.shaded.netty.handler.ssl.SslContextBuilder;
import org.apache.cassandra.distributed.Cluster;
import org.apache.cassandra.distributed.api.Feature;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org