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/73c48260 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73c48260 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73c48260 Branch: refs/heads/trunk Commit: 73c48260d74e5114ea9d2b79726b308181c2b465 Parents: 6f848db a4f32c5 Author: Yuki Morishita <[email protected]> Authored: Mon Oct 26 12:52:22 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Mon Oct 26 12:52:22 2015 -0500 ---------------------------------------------------------------------- .../db/compaction/CompactionManager.java | 32 ++++++++++++++++++++ .../cassandra/service/StorageService.java | 3 ++ 2 files changed, 35 insertions(+) ----------------------------------------------------------------------
