Merge branch 'cassandra-3.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/04fa6457 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04fa6457 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04fa6457 Branch: refs/heads/trunk Commit: 04fa645743e2d9ce864a39fa59d261f21d1c62d4 Parents: a252e3f 0798905 Author: Yuki Morishita <[email protected]> Authored: Thu Oct 22 09:47:29 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Thu Oct 22 09:47:29 2015 -0500 ---------------------------------------------------------------------- .../io/sstable/SimpleSSTableMultiWriter.java | 2 +- .../io/sstable/format/big/BigTableWriter.java | 4 +- .../unit/org/apache/cassandra/db/ScrubTest.java | 52 ++++++++++++++++---- 3 files changed, 45 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
