Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95ccf2de Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95ccf2de Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95ccf2de Branch: refs/heads/trunk Commit: 95ccf2de8b3ffd84b8ec8333aaa895d1535ba47c Parents: e070440 1aa14bc Author: Joel Knighton <[email protected]> Authored: Mon Jul 24 14:53:32 2017 -0500 Committer: Joel Knighton <[email protected]> Committed: Mon Jul 24 14:53:32 2017 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/gms/Gossiper.java | 5 +++-- src/java/org/apache/cassandra/gms/HeartBeatState.java | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95ccf2de/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95ccf2de/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
