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/5c2a4ef2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c2a4ef2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c2a4ef2 Branch: refs/heads/trunk Commit: 5c2a4ef280256d0d982d6322672893a8e2846988 Parents: 7863bd3 d436407 Author: Marcus Eriksson <[email protected]> Authored: Thu Feb 11 08:29:22 2016 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Thu Feb 11 08:29:22 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/compaction/CompactionManager.java | 12 +++--------- .../org/apache/cassandra/db/compaction/Scrubber.java | 12 ++++-------- .../org/apache/cassandra/tools/StandaloneScrubber.java | 2 +- test/unit/org/apache/cassandra/db/ScrubTest.java | 12 ++++++------ 5 files changed, 15 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c2a4ef2/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c2a4ef2/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c2a4ef2/src/java/org/apache/cassandra/db/compaction/Scrubber.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c2a4ef2/test/unit/org/apache/cassandra/db/ScrubTest.java ----------------------------------------------------------------------
