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/3d03b9b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d03b9b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d03b9b5 Branch: refs/heads/trunk Commit: 3d03b9b5ac9e345d13b19f4909e24d5e8b8e0dd0 Parents: bcb3f47 99de2ff Author: Marcus Eriksson <[email protected]> Authored: Fri Apr 25 08:22:23 2014 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Fri Apr 25 08:22:23 2014 +0200 ---------------------------------------------------------------------- .../cassandra/db/compaction/CompactionTask.java | 3 ++- .../cassandra/db/compaction/SSTableSplitter.java | 4 ++-- .../apache/cassandra/io/sstable/SSTableRewriter.java | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
