Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02492f7b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02492f7b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02492f7b Branch: refs/heads/cassandra-3.1 Commit: 02492f7bca4d668c7c5ad60641f8d182f966cb37 Parents: 4c6f325 ad84add Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Dec 2 09:01:52 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Dec 2 09:01:52 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/02492f7b/CHANGES.txt ----------------------------------------------------------------------
