cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Date Fri, 18 Oct 2013 02:06:25 GMT
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/659296b9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/659296b9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/659296b9

Branch: refs/heads/trunk
Commit: 659296b927cc992061410a037bd2fba7fc1c7057
Parents: 99c9315 f084119
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Thu Oct 17 21:04:43 2013 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Thu Oct 17 21:04:43 2013 -0500

----------------------------------------------------------------------
 NEWS.txt                                        |   5 +-
 .../cassandra/config/DatabaseDescriptor.java    |  17 ++-
 .../org/apache/cassandra/db/SystemKeyspace.java |   9 +-
 .../gms/GossipDigestAckVerbHandler.java         |  10 +-
 .../gms/GossipDigestSynVerbHandler.java         |   2 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  71 +++++++++++-
 .../cassandra/service/StorageService.java       | 115 ++++++++++++-------
 7 files changed, 182 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/659296b9/NEWS.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/659296b9/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/659296b9/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/659296b9/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java
----------------------------------------------------------------------

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

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


Mime
View raw message