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/8f243a91 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f243a91 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f243a91 Branch: refs/heads/trunk Commit: 8f243a912362fb5e1e960150bcf5ebee5d5b149b Parents: e890b1f bc12d73 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Aug 15 15:17:22 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Aug 15 15:17:22 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 + .../db/compaction/CompactionManager.java | 58 ++++++++++ .../org/apache/cassandra/dht/IPartitioner.java | 3 +- .../cassandra/io/sstable/SSTableReader.java | 44 +++++++- .../apache/cassandra/io/util/SegmentedFile.java | 2 +- .../db/compaction/CompactionsTest.java | 112 +++++++++++++++++++ 6 files changed, 216 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f243a91/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f243a91/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
