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/4abd9936 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4abd9936 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4abd9936 Branch: refs/heads/trunk Commit: 4abd9936342f5faf3e23c3d395e24278a3b3bfbd Parents: 72790dc f217428 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Jan 25 10:09:31 2016 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Jan 25 10:09:31 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Memtable.java | 9 + .../db/compaction/CompactionController.java | 19 +- .../db/compaction/CompactionControllerTest.java | 195 +++++++++++++++++++ 4 files changed, 221 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4abd9936/CHANGES.txt ----------------------------------------------------------------------
