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/02/18 22:02:12 UTC

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

Branch: refs/heads/trunk
Commit: 94ff02fcb2a966b0123457f5ea928462e408c232
Parents: 57ac2f8 add7356
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Feb 18 15:01:50 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Feb 18 15:01:50 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../org/apache/cassandra/repair/RepairJob.java  | 105 ++++++++-----------
 .../apache/cassandra/repair/RepairSession.java  |  13 ++-
 .../apache/cassandra/repair/SnapshotTask.java   |  79 ++++++++++++++
 4 files changed, 132 insertions(+), 66 deletions(-)
----------------------------------------------------------------------