Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c8d15f04 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8d15f04 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8d15f04 Branch: refs/heads/trunk Commit: c8d15f04f1efd37668e2ccbc681730ae6b2199da Parents: e5f3bb6 37d6730 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Sep 4 15:04:18 2017 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Sep 4 15:04:18 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java | 4 +- .../db/compaction/CompactionExecutorTest.java | 109 +++++++++++++++++++ 3 files changed, 112 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8d15f04/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8d15f04/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
