You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mi...@apache.org on 2014/03/13 21:08:05 UTC
[1/2] git commit: Load a truststore if client certificate
authentication is enabled
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 da2d97142 -> dce559995
Load a truststore if client certificate authentication is enabled
patch by Mikhail Stepura; reviewed by Jason Brown for CASSANDRA-6847
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/173df48b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/173df48b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/173df48b
Branch: refs/heads/cassandra-2.0
Commit: 173df48bb36402bf59accb02537450703b8eedd8
Parents: 52cf09d
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Mar 13 11:27:43 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Mar 13 13:05:31 2014 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/transport/Server.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/173df48b/src/java/org/apache/cassandra/transport/Server.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Server.java b/src/java/org/apache/cassandra/transport/Server.java
index 0ffb92b..5773728 100644
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@ -257,7 +257,7 @@ public class Server implements CassandraDaemon.Server
this.encryptionOptions = encryptionOptions;
try
{
- this.sslContext = SSLFactory.createSSLContext(encryptionOptions, false);
+ this.sslContext = SSLFactory.createSSLContext(encryptionOptions, encryptionOptions.require_client_auth);
}
catch (IOException e)
{
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by mi...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dce55999
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dce55999
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dce55999
Branch: refs/heads/cassandra-2.0
Commit: dce5599953adfabb5a6ecace37a5c4c6de3e7885
Parents: da2d971 173df48
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Mar 13 13:05:52 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Mar 13 13:05:52 2014 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/transport/Server.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dce55999/src/java/org/apache/cassandra/transport/Server.java
----------------------------------------------------------------------