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:13 UTC

[cassandra] 01/01: Merge branch 'cassandra-2.2' into cassandra-3.0

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