You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2021/01/29 10:57:42 UTC

[cassandra] branch cassandra-3.11 updated (24d133e -> aa317ae)

This is an automated email from the ASF dual-hosted git repository.

aleksey pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 24d133e  Merge branch 'cassandra-3.0' into cassandra-3.11
     add c2f24d2  Fix inbound TLS enforcement
     add aa317ae  Merge branch 'cassandra-3.0' into cassandra-3.11

No new revisions were added by this update.

Summary of changes:
 src/java/org/apache/cassandra/config/Config.java   |   1 +
 .../cassandra/config/DatabaseDescriptor.java       |   4 +-
 .../apache/cassandra/config/EncryptionOptions.java |  47 +++++++
 .../cassandra/net/IncomingStreamingConnection.java |  20 +++
 .../cassandra/net/IncomingTcpConnection.java       |  22 ++++
 .../cassandra/net/OutboundTcpConnectionPool.java   |  26 +---
 test/conf/cassandra_ssl_test.keystore              | Bin 0 -> 2281 bytes
 test/conf/cassandra_ssl_test.truststore            | Bin 0 -> 992 bytes
 .../test/InternodeEncryptionEnforcementTest.java   | 137 +++++++++++++++++++++
 9 files changed, 231 insertions(+), 26 deletions(-)
 create mode 100644 test/conf/cassandra_ssl_test.keystore
 create mode 100644 test/conf/cassandra_ssl_test.truststore
 create mode 100644 test/distributed/org/apache/cassandra/distributed/test/InternodeEncryptionEnforcementTest.java


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org