You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2021/08/12 15:51:02 UTC

[cassandra] 01/01: Merge branch 'CASSANDRA-16847-4.0' into CASSANDRA-16847-trunk

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch CASSANDRA-16847-trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit b92ce57056abf7f26361eb11ee1babf8854a121f
Merge: 39af4a5 9b4d999
Author: Brandon Williams <br...@apache.org>
AuthorDate: Thu Aug 12 10:50:26 2021 -0500

    Merge branch 'CASSANDRA-16847-4.0' into CASSANDRA-16847-trunk

 src/java/org/apache/cassandra/gms/Gossiper.java          | 8 +++++---
 src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)


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