Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f47d9769 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f47d9769 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f47d9769 Branch: refs/heads/trunk Commit: f47d9769ffc20c29d611972bddae12c44a4df35f Parents: 4509934 1d1bfae Author: Marcus Eriksson <[email protected]> Authored: Wed Mar 23 15:00:34 2016 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Wed Mar 23 15:00:34 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java | 49 ++++++++++++++------ 2 files changed, 35 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f47d9769/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7d74b6e,cf36047..85fca0f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,7 +1,8 @@@ -3.0.5 +3.5 +Merged from 3.0: + * Allocate merkletrees with the correct size (CASSANDRA-11390) * Support streaming pre-3.0 sstables (CASSANDRA-10990) - * Add backpressure to compressed commit log (CASSANDRA-10971) + * Add backpressure to compressed or encrypted commit log (CASSANDRA-10971) * SSTableExport supports secondary index tables (CASSANDRA-11330) * Fix sstabledump to include missing info in debug output (CASSANDRA-11321) * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f47d9769/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
