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/04/03 22:50:59 UTC
[10/10] 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/9757e8ec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9757e8ec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9757e8ec
Branch: refs/heads/trunk
Commit: 9757e8ec4d2cbf81c5edb085aec4086cc5bf8da1
Parents: 4ebf82c 4717d27
Author: Brandon Williams <br...@apache.org>
Authored: Thu Apr 3 12:42:55 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Apr 3 12:42:55 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9757e8ec/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9757e8ec/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------