You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by aw...@apache.org on 2018/06/28 16:58:18 UTC

cassandra git commit: OffsetAwareConfigurationLoader doesn't set ssl storage port causing bind errors in CircleCI

Repository: cassandra
Updated Branches:
  refs/heads/trunk 85ceec885 -> 4cb83cb81


OffsetAwareConfigurationLoader doesn't set ssl storage port causing bind errors in CircleCI

Patch by Dinesh Joshi; Reviewed by Ariel Weisberg for CASSANDRA-14546


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

Branch: refs/heads/trunk
Commit: 4cb83cb81abe6990820f76c0addbd172d9f248a6
Parents: 85ceec8
Author: Dinesh A. Joshi <di...@apple.com>
Authored: Wed Jun 27 19:18:24 2018 -0700
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Thu Jun 28 12:53:11 2018 -0400

----------------------------------------------------------------------
 CHANGES.txt                                                        | 1 +
 test/unit/org/apache/cassandra/OffsetAwareConfigurationLoader.java | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4cb83cb8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index df2db42..856672c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0
+ * OffsetAwareConfigurationLoader doesn't set ssl storage port causing bind errors in CircleCI (CASSANDRA-14546)
  * Report why native_transport_port fails to bind (CASSANDRA-14544)
  * Optimize internode messaging protocol (CASSANDRA-14485)
  * Internode messaging handshake sends wrong messaging version number (CASSANDRA-14540)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4cb83cb8/test/unit/org/apache/cassandra/OffsetAwareConfigurationLoader.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/OffsetAwareConfigurationLoader.java b/test/unit/org/apache/cassandra/OffsetAwareConfigurationLoader.java
index d06caba..23138b0 100644
--- a/test/unit/org/apache/cassandra/OffsetAwareConfigurationLoader.java
+++ b/test/unit/org/apache/cassandra/OffsetAwareConfigurationLoader.java
@@ -58,6 +58,7 @@ public class OffsetAwareConfigurationLoader extends YamlConfigurationLoader
 
         config.native_transport_port += offset;
         config.storage_port += offset;
+        config.ssl_storage_port += offset;
 
         //Rewrite the seed ports string
         String[] hosts = config.seed_provider.parameters.get("seeds").split(",", -1);


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