You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/24 17:48:10 UTC

[03/11] git commit: Merge branch 'cassandra-2.0' into trunk

Merge branch 'cassandra-2.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/108b4db5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/108b4db5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/108b4db5

Branch: refs/heads/trunk
Commit: 108b4db53bfc5d7507ccca228ca942d85eb3dc0a
Parents: 99691be f3dddb3
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 24 10:14:12 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 24 10:14:12 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  3 +++
 src/java/org/apache/cassandra/gms/Gossiper.java | 20 ++++++++++++++++----
 .../apache/cassandra/service/StorageProxy.java  |  3 ++-
 3 files changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/108b4db5/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/108b4db5/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/108b4db5/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------