You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by if...@apache.org on 2019/12/18 17:12:12 UTC
[cassandra] branch cassandra-3.0 updated (3c73a13 -> 49918ef)
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a change to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 3c73a13 Merge branch 'cassandra-2.2' into cassandra-3.0
new 5635928 Pass correct seed node through to InstanceConfig so it can set it properly when starting clusters on non-0 subnets.
new 49918ef Merge branch 'cassandra-2.2' into cassandra-3.0
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cassandra/distributed/impl/AbstractCluster.java | 3 ++-
.../cassandra/distributed/impl/InstanceConfig.java | 6 ++++--
.../test/{NodeToolTest.java => GossipSettlesTest.java} | 16 ++++++++++------
3 files changed, 16 insertions(+), 9 deletions(-)
copy test/distributed/org/apache/cassandra/distributed/test/{NodeToolTest.java => GossipSettlesTest.java} (64%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-2.2' into cassandra-3.0
Posted by if...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 49918efa803d6a420a281f24f9b12ca9208ba68f
Merge: 3c73a13 5635928
Author: Alex Petrov <ol...@gmail.com>
AuthorDate: Wed Dec 18 18:05:04 2019 +0100
Merge branch 'cassandra-2.2' into cassandra-3.0
.../distributed/impl/AbstractCluster.java | 3 +-
.../cassandra/distributed/impl/InstanceConfig.java | 6 ++--
.../distributed/test/GossipSettlesTest.java | 42 ++++++++++++++++++++++
3 files changed, 48 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org