cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [03/11] cassandra git commit: Honor truststore-password parameter in stress
Date Thu, 23 Mar 2017 20:01:21 GMT
Honor truststore-password parameter in stress

patch by Jane Deng; reviewed by Robert Stupp for CASSANDRA-12773


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5978f9d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5978f9d5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5978f9d5

Branch: refs/heads/cassandra-3.0
Commit: 5978f9d5f719455ceb79d5f077cdd1b72b4e1876
Parents: bf0906b
Author: Stefan Podkowinski <s.podkowinski@gmail.com>
Authored: Thu Mar 23 20:48:03 2017 +0100
Committer: Stefan Podkowinski <s.podkowinski@gmail.com>
Committed: Thu Mar 23 20:48:03 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                         | 1 +
 .../src/org/apache/cassandra/stress/settings/SettingsTransport.java | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5978f9d5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index df2421d..a415395 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.10
+ * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
  * Discard in-flight shadow round responses (CASSANDRA-12653)
  * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
  * Wrong logger name in AnticompactionTask (CASSANDRA-13343)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5978f9d5/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
index b6d1d90..a253c07 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
@@ -115,6 +115,7 @@ public class SettingsTransport implements Serializable
             {
                 // mandatory for SSLFactory.createSSLContext(), see CASSANDRA-9325
                 encOptions.keystore = encOptions.truststore;
+                encOptions.keystore_password = encOptions.truststore_password;
             }
             encOptions.algorithm = options.alg.value();
             encOptions.protocol = options.protocol.value();


Mime
View raw message