cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Tue, 15 Apr 2014 22:34:05 GMT
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/2804ce99
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2804ce99
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2804ce99

Branch: refs/heads/trunk
Commit: 2804ce9945a83a696e36b4add7a684b132fdef7c
Parents: fc4ae11 de8a479
Author: Yuki Morishita <yukim@apache.org>
Authored: Tue Apr 15 17:15:01 2014 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Tue Apr 15 17:15:01 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 18 ++++++-
 .../repair/RepairMessageVerbHandler.java        | 33 +++++++++---
 .../apache/cassandra/repair/SnapshotTask.java   |  8 +--
 .../repair/messages/RepairMessage.java          |  3 +-
 .../repair/messages/SnapshotMessage.java        | 53 ++++++++++++++++++++
 6 files changed, 100 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message