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:28 UTC
[12/14] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82d5f6ad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82d5f6ad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82d5f6ad
Branch: refs/heads/trunk
Commit: 82d5f6ad599a5f19771155c5e0f839219bd6da07
Parents: 4ee374a b89037f
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Dec 2 11:11:23 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Dec 2 11:11:23 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------