Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6381db8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6381db8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6381db8 Branch: refs/heads/trunk Commit: f6381db8edf1c532f881adb3806205cd24b0b67c Parents: 0525145 0d12169 Author: Paulo Motta <pa...@apache.org> Authored: Wed Dec 13 06:41:11 2017 +1100 Committer: Paulo Motta <pa...@apache.org> Committed: Wed Dec 13 06:41:11 2017 +1100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java | 15 ++++-- .../db/compaction/CompactionsBytemanTest.java | 56 ++++++++++++++++++++ 3 files changed, 68 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6381db8/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6381db8/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
