Merge branch 'cassandra-3.0' into cassandra-3.7 Conflicts: CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40e4b0b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40e4b0b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40e4b0b0 Branch: refs/heads/trunk Commit: 40e4b0b08fc1ffe27e8c0f59234aa496f526fbef Parents: 5fde342 c98b648 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Sun Jun 5 18:29:16 2016 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Sun Jun 5 18:29:16 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/db/LegacyLayout.java | 77 +++++++++++++++++++- 2 files changed, 77 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/40e4b0b0/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 9e3857b,201a36c..3605752 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,8 +1,12 @@@ -3.0.7 +3.7 + * Support multiple folders for user defined compaction tasks (CASSANDRA-11765) + * Fix race in CompactionStrategyManager's pause/resume (CASSANDRA-11922) +Merged from 3.0: + * Fix legacy serialization of Thrift-generated non-compound range tombstones + when communicating with 2.x nodes (CASSANDRA-11930) * Fix Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849) * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912) + * Don't use static dataDirectories field in Directories instances (CASSANDRA-11647) * Fix sstables not being protected from removal during index build (CASSANDRA-11905) * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032) * Remove unneeded code to repair index summaries that have http://git-wip-us.apache.org/repos/asf/cassandra/blob/40e4b0b0/src/java/org/apache/cassandra/db/LegacyLayout.java ----------------------------------------------------------------------