Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/672874c0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/672874c0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/672874c0 Branch: refs/heads/trunk Commit: 672874c08cf7b731891eff323c9388453a6b7993 Parents: d9e79bd 5a7ff5e Author: Stefania Alborghetti <[email protected]> Authored: Fri Jun 3 16:30:18 2016 +0200 Committer: Stefania Alborghetti <[email protected]> Committed: Fri Jun 3 16:30:18 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java | 9 ++-- .../compaction/CompactionStrategyManager.java | 43 ++++++++++++++++++-- test/unit/org/apache/cassandra/Util.java | 5 ++- .../db/compaction/CompactionsPurgeTest.java | 9 +++- 5 files changed, 57 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/672874c0/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e9dd9d4,9e3857b..0de27e0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,17 @@@ +3.8 + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853) + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718) + * Support older ant versions (CASSANDRA-11807) + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623) + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546) + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578) + * Faster streaming (CASSANDRA-9766) + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425) + * Add repaired percentage metric (CASSANDRA-11503) + + 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 Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849) http://git-wip-us.apache.org/repos/asf/cassandra/blob/672874c0/test/unit/org/apache/cassandra/Util.java ----------------------------------------------------------------------
