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/f0613bf6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0613bf6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0613bf6 Branch: refs/heads/trunk Commit: f0613bf6dafe405b5f65f56e436df1959172c245 Parents: 9530b27 c59897b Author: Stefania Alborghetti <[email protected]> Authored: Fri Jun 10 15:18:58 2016 -0500 Committer: Stefania Alborghetti <[email protected]> Committed: Fri Jun 10 15:18:58 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0613bf6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 309a48d,fd2fe79..d699f93 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,9 +1,24 @@@ -3.0.8 +3.8 + * 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) +Merged from 3.0: * Add TimeWindowCompactionStrategy (CASSANDRA-9666) - + Merged from 2.2: + * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984) -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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0613bf6/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
