From 5978f9d5f719455ceb79d5f077cdd1b72b4e1876 Mon Sep 17 00:00:00 2001 From: Stefan Podkowinski Date: Thu, 23 Mar 2017 20:48:03 +0100 Subject: [PATCH] Honor truststore-password parameter in stress patch by Jane Deng; reviewed by Robert Stupp for CASSANDRA-12773 --- CHANGES.txt | 1 + .../org/apache/cassandra/stress/settings/SettingsTransport.java | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index df2421ddc1..a4153955e7 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) 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 b6d1d909c0..a253c0709e 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();