This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from d68c45e Merge branch 'cassandra-3.11' into trunk
new f293376 TLS connections to the storage port on a node without server
encryption configured causes java.io.IOException accessing missing keystore
new e74bd9f Merge branch 'cassandra-2.2' into cassandra-3.0
new 3200bcf Merge branch 'cassandra-3.0' into cassandra-3.11
new 001767d Merge branch 'cassandra-3.11' into trunk
The 4 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:
CHANGES.txt | 1 +
.../cassandra/config/DatabaseDescriptor.java | 23 +-
.../apache/cassandra/config/EncryptionOptions.java | 234 ++++++++++++----
.../cassandra/config/YamlConfigurationLoader.java | 4 +-
.../apache/cassandra/db/virtual/SettingsTable.java | 2 +-
.../cassandra/net/InboundConnectionInitiator.java | 83 +++---
.../cassandra/net/InboundConnectionSettings.java | 6 +-
.../org/apache/cassandra/net/InboundSockets.java | 4 +-
.../apache/cassandra/net/OutboundConnection.java | 3 +-
.../cassandra/net/OutboundConnectionSettings.java | 3 +-
.../org/apache/cassandra/net/SocketFactory.java | 52 ++--
.../org/apache/cassandra/security/SSLFactory.java | 14 +-
.../cassandra/service/NativeTransportService.java | 50 ++--
.../org/apache/cassandra/tools/LoaderOptions.java | 12 +-
.../org/apache/cassandra/transport/Client.java | 4 +-
.../org/apache/cassandra/transport/Server.java | 43 ++-
.../apache/cassandra/transport/SimpleClient.java | 2 +-
.../cassandra/distributed/impl/InstanceConfig.java | 21 +-
.../test/AbstractEncryptionOptionsImpl.java | 295 +++++++++++++++++++++
.../distributed/test/IncRepairTruncationTest.java | 3 +-
.../test/InternodeEncryptionOptionsTest.java | 218 +++++++++++++++
.../test/NativeTransportEncryptionOptionsTest.java | 137 ++++++++++
.../distributed/test/PreviewRepairTest.java | 3 +-
.../cassandra/config/EncryptionOptionsTest.java | 178 +++++++++++++
.../config/YamlConfigurationLoaderTest.java | 11 +-
test/unit/org/apache/cassandra/cql3/CQLTester.java | 2 +-
.../cassandra/db/virtual/SettingsTableTest.java | 6 +-
.../apache/cassandra/net/MessagingServiceTest.java | 6 +-
.../service/NativeTransportServiceTest.java | 86 +++++-
.../stress/settings/SettingsTransport.java | 2 +-
.../cassandra/stress/util/JavaDriverClient.java | 2 +-
31 files changed, 1298 insertions(+), 212 deletions(-)
create mode 100644
test/distributed/org/apache/cassandra/distributed/test/AbstractEncryptionOptionsImpl.java
create mode 100644
test/distributed/org/apache/cassandra/distributed/test/InternodeEncryptionOptionsTest.java
create mode 100644
test/distributed/org/apache/cassandra/distributed/test/NativeTransportEncryptionOptionsTest.java
create mode 100644
test/unit/org/apache/cassandra/config/EncryptionOptionsTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
