Merge branch 'cassandra-3.0' into trunk * cassandra-3.0: Add a metrics timer to MemtablePool and use it to track time spent blocked on memory in MemtableAllocator.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c84fe4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c84fe4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c84fe4f Branch: refs/heads/trunk Commit: 5c84fe4f9deb0a8c889543dfb36ac1b55fecfc10 Parents: 4657023 458b36b Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Jun 23 11:18:19 2016 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Jun 23 11:18:19 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/utils/memory/MemtableAllocator.java | 2 +- .../org/apache/cassandra/utils/memory/MemtablePool.java | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c84fe4f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 59ae769,ee2f6d3..5c03f93 --- 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: + * 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) Merged from 2.2: http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c84fe4f/src/java/org/apache/cassandra/utils/memory/MemtableAllocator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c84fe4f/src/java/org/apache/cassandra/utils/memory/MemtablePool.java ----------------------------------------------------------------------
