Merge branch 'cassandra-3.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/ca70561f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca70561f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca70561f Branch: refs/heads/trunk Commit: ca70561f2e54ef3fe7447a124d5c779e6ebe6050 Parents: 6bf1f75 02492f7 Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Dec 2 09:02:28 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Dec 2 09:02:28 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java | 4 +- src/java/org/apache/cassandra/dht/Range.java | 42 +++++++++++++ .../org/apache/cassandra/dht/RangeTest.java | 65 ++++++++++++++++++++ 4 files changed, 110 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca70561f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca70561f/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
