You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/12/02 17:14:30 UTC
[14/14] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57e86f7c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57e86f7c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57e86f7c
Branch: refs/heads/trunk
Commit: 57e86f7c099a17c9186f66c8c31543ba7a888a72
Parents: d30c30b 82d5f6a
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Dec 2 11:14:04 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Dec 2 11:14:04 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------