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/61c988e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61c988e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61c988e5

Branch: refs/heads/trunk
Commit: 61c988e519733874897807f8ec64c73602a088c9
Parents: e14e731 f40c632
Author: Yuki Morishita <[email protected]>
Authored: Tue May 31 15:53:00 2016 -0500
Committer: Yuki Morishita <[email protected]>
Committed: Tue May 31 15:53:00 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../compaction/CompactionStrategyManager.java   | 40 +++++++++++++++-----
 .../cassandra/db/compaction/CompactionTask.java |  2 +-
 3 files changed, 33 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/61c988e5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 842174e,d7b3dd4..eecf2ca
--- 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
+  * Fix race in CompactionStrategyManager's pause/resume (CASSANDRA-11922)
  Merged from 3.0:
   * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
   * Don't use static dataDirectories field in Directories instances 
(CASSANDRA-11647)

Reply via email to