You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/06/19 18:34:00 UTC

[9/9] 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/65b19cae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65b19cae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65b19cae

Branch: refs/heads/trunk
Commit: 65b19cae328d61b73fd7b0a12d7b107acd29e704
Parents: 7d8ba3b 40f8eba
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Jun 19 11:33:34 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Jun 19 11:33:34 2014 -0500

----------------------------------------------------------------------
 .../apache/cassandra/db/RangeTombstoneList.java |  2 +
 .../cassandra/service/ActiveRepairService.java  |  3 -
 .../cassandra/service/StorageService.java       | 64 +++++++++++++++-----
 .../org/apache/cassandra/tools/NodeTool.java    |  3 +
 4 files changed, 54 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/65b19cae/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------