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.0' into trunk
Date Wed, 07 Aug 2013 17:55:28 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/9cf1068b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9cf1068b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9cf1068b

Branch: refs/heads/trunk
Commit: 9cf1068b73e9d7ce47b3d2eaf223a20cb6779940
Parents: 426caf7 18f0234
Author: Yuki Morishita <yukim@apache.org>
Authored: Wed Aug 7 12:20:19 2013 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Wed Aug 7 12:20:19 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../org/apache/cassandra/repair/Validator.java  |  61 ++++-
 .../cassandra/utils/EstimatedHistogram.java     |  65 ++++++
 .../cassandra/utils/HistogramBuilder.java       | 158 +++++++++++++
 .../org/apache/cassandra/utils/MerkleTree.java  | 233 ++++++++++++++-----
 .../cassandra/repair/DifferencerTest.java       |   2 +-
 .../cassandra/utils/HistogramBuilderTest.java   | 109 +++++++++
 .../apache/cassandra/utils/MerkleTreeTest.java  |   9 +-
 8 files changed, 572 insertions(+), 66 deletions(-)
----------------------------------------------------------------------



Mime
View raw message