Merge branch 'cassandra-3.0' into trunk

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc7785bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc7785bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc7785bf

Branch: refs/heads/trunk
Commit: fc7785bfe643f516398a3d01655b009102f798ca
Parents: 84e40cb ffd6bab
Author: Marcus Eriksson <marc...@apache.org>
Authored: Thu Jun 23 15:15:25 2016 +0200
Committer: Marcus Eriksson <marc...@apache.org>
Committed: Thu Jun 23 15:15:25 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                             |  2 ++
 .../apache/cassandra/service/ActiveRepairService.java   | 12 +++++++++++-
 .../org/apache/cassandra/service/StorageService.java    |  6 ++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc7785bf/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 474ad5c,0e9935d..f5843ec
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
 -3.0.8
 +3.8
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * 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)
 + * Add Change-Data-Capture (CASSANDRA-8844)
 +Merged from 3.0:
+  * Disable autocompaction during drain (CASSANDRA-11878)
   * Add a metrics timer to MemtablePool and use it to track time spent blocked 
on memory in MemtableAllocator (CASSANDRA-11327)
   * Fix upgrading schema with super columns with non-text subcomparators 
(CASSANDRA-12023)
   * Add TimeWindowCompactionStrategy (CASSANDRA-9666)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc7785bf/src/java/org/apache/cassandra/service/ActiveRepairService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc7785bf/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------

Reply via email to