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/2a6aa8cf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a6aa8cf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a6aa8cf Branch: refs/heads/trunk Commit: 2a6aa8cfb71c89de43cc1ab69050f3244481dc10 Parents: 2601639 3d78939 Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Dec 30 09:00:10 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Dec 30 09:00:10 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/streaming/StreamReceiveTask.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a6aa8cf/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 17829d7,dd517f5..5cd1b4c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,30 -1,7 +1,31 @@@ -3.0.3 +3.2 + * Add forceUserDefinedCleanup to allow more flexible cleanup (CASSANDRA-10708) + * (cqlsh) allow setting TTL with COPY (CASSANDRA-9494) + * Fix counting of received sstables in streaming (CASSANDRA-10949) * Implement hints compression (CASSANDRA-9428) * Fix potential assertion error when reading static columns (CASSANDRA-10903) + * Fix EstimatedHistogram creation in nodetool tablehistograms (CASSANDRA-10859) + * Establish bootstrap stream sessions sequentially (CASSANDRA-6992) + * Sort compactionhistory output by timestamp (CASSANDRA-10464) + * More efficient BTree removal (CASSANDRA-9991) + * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149) + * Group pending compactions based on table (CASSANDRA-10718) + * Add compressor name in sstablemetadata output (CASSANDRA-9879) + * Fix type casting for counter columns (CASSANDRA-10824) + * Prevent running Cassandra as root (CASSANDRA-8142) + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes (CASSANDRA-8639) + * Normalize all scripts (CASSANDRA-10679) + * Make compression ratio much more accurate (CASSANDRA-10225) + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) +Merged from 3.0: * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711) * Avoid building PartitionUpdate in toString (CASSANDRA-10897) * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
