cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [1/3] git commit: Merge branch 'cassandra-1.1' into trunk
Date Thu, 29 Mar 2012 18:07:47 GMT
Updated Branches:
  refs/heads/cassandra-1.1 27c999a11 -> 190e27bb5
  refs/heads/trunk 27e322b63 -> f0ea699e6


Merge branch 'cassandra-1.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/f0ea699e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0ea699e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0ea699e

Branch: refs/heads/trunk
Commit: f0ea699e62d498c1d5c647cf78f016e360a236d4
Parents: 27e322b 190e27b
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Thu Mar 29 13:07:39 2012 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Thu Mar 29 13:07:39 2012 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/gms/FailureDetector.java  |    9 ++
 .../cassandra/gms/GossipShutdownMessage.java       |   63 +++++++++++++++
 .../cassandra/gms/GossipShutdownVerbHandler.java   |   42 ++++++++++
 src/java/org/apache/cassandra/gms/Gossiper.java    |   50 +++++++++++-
 .../org/apache/cassandra/gms/IFailureDetector.java |    5 +
 .../apache/cassandra/service/StorageService.java   |    3 +
 .../org/apache/cassandra/dht/BootStrapperTest.java |    1 +
 7 files changed, 171 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0ea699e/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0ea699e/src/java/org/apache/cassandra/gms/IFailureDetector.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0ea699e/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0ea699e/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
----------------------------------------------------------------------


Mime
View raw message