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/e4148684 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4148684 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4148684 Branch: refs/heads/trunk Commit: e4148684725151aef4c0489c0c809f3983dabe37 Parents: 3b45d00 f0c9bd1 Author: Marcus Eriksson <[email protected]> Authored: Mon Feb 24 10:22:56 2014 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Mon Feb 24 10:22:56 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../cassandra/db/compaction/Scrubber.java | 11 +++-- .../cassandra/io/sstable/SSTableWriter.java | 14 +++++- tools/bin/sstablerepairedset | 46 ++++++++++++++++++++ 4 files changed, 68 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4148684/CHANGES.txt ----------------------------------------------------------------------
