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/e8a5327b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8a5327b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8a5327b Branch: refs/heads/trunk Commit: e8a5327bb98e7b449f561c06a7cda43099320647 Parents: 4f51341 605bcdc Author: Benedict Elliott Smith <bened...@apache.org> Authored: Fri Aug 7 10:01:44 2015 +0200 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Fri Aug 7 10:01:44 2015 +0200 ---------------------------------------------------------------------- .../compaction/AbstractCompactionStrategy.java | 2 +- .../cassandra/db/compaction/CompactionTask.java | 11 +++++-- .../DateTieredCompactionStrategy.java | 6 ++-- .../db/compaction/LeveledCompactionTask.java | 6 ++-- .../db/compaction/SSTableSplitter.java | 4 +-- .../cassandra/db/compaction/Scrubber.java | 32 ++++++++------------ .../SizeTieredCompactionStrategy.java | 12 ++++---- .../writers/CompactionAwareWriter.java | 12 ++++++-- .../writers/DefaultCompactionWriter.java | 9 ++++-- .../writers/MajorLeveledCompactionWriter.java | 17 +++++++++-- .../writers/MaxSSTableSizeWriter.java | 19 ++++++++++-- .../SplittingSizeTieredCompactionWriter.java | 2 +- .../cassandra/db/lifecycle/TransactionLogs.java | 2 +- .../cassandra/io/sstable/SSTableTxnWriter.java | 6 ++-- .../cassandra/tools/StandaloneSplitter.java | 7 +---- .../db/compaction/LongCompactionsTest.java | 2 +- .../unit/org/apache/cassandra/db/ScrubTest.java | 7 +++-- .../compaction/CompactionAwareWriterTest.java | 6 ++-- .../io/sstable/BigTableWriterTest.java | 13 ++++++-- .../io/sstable/SSTableRewriterTest.java | 2 -- 20 files changed, 110 insertions(+), 67 deletions(-) ----------------------------------------------------------------------
