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/fc89a379 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc89a379 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc89a379 Branch: refs/heads/trunk Commit: fc89a379cda4966dd57e3c65ebb5f383cd846925 Parents: ef4d450 628c076 Author: Yuki Morishita <[email protected]> Authored: Thu Jan 14 09:58:53 2016 -0600 Committer: Yuki Morishita <[email protected]> Committed: Thu Jan 14 09:58:53 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/compaction/CompactionManager.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc89a379/CHANGES.txt ----------------------------------------------------------------------
