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/0e526666 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e526666 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e526666 Branch: refs/heads/trunk Commit: 0e5266664eaf71cad06407685dd8b947aac2179e Parents: 29d4a82 8bfe09f Author: Marcus Eriksson <[email protected]> Authored: Wed Apr 27 10:11:08 2016 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Wed Apr 27 10:11:08 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/compaction/CompactionManager.java | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e526666/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e526666/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
