Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f984e33 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f984e33 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f984e33 Branch: refs/heads/trunk Commit: 2f984e330ed6e58582359afa3bb4d5b9cf6e6440 Parents: 190e14a 7074dda Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Jan 22 16:25:15 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Jan 22 16:25:15 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java | 25 +++++++++++++------- .../cassandra/service/StorageService.java | 1 + 3 files changed, 19 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f984e33/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f984e33/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
