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 2014/12/01 17:37:18 UTC
[6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.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/94ba744b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94ba744b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94ba744b
Branch: refs/heads/trunk
Commit: 94ba744b373a741c2a42786249f54b73bda02e11
Parents: 6348957 9a4712e
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 10:37:04 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 10:37:04 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 25 +++++++++++++++++++-
.../cassandra/service/StorageService.java | 4 ++++
3 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94ba744b/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94ba744b/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94ba744b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------