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/6bc36372 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bc36372 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bc36372 Branch: refs/heads/trunk Commit: 6bc3637260f287a031f2ea8a7e155a6b7692fe92 Parents: 9bfe613 71bac92 Author: Sylvain Lebresne <[email protected]> Authored: Mon Dec 14 10:58:53 2015 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Dec 14 10:58:53 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 5 ++++- .../org/apache/cassandra/db/UnfilteredDeserializer.java | 11 +++++------ .../cassandra/db/compaction/CompactionManager.java | 5 ++++- 3 files changed, 13 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bc36372/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0ca5277,a0717c6..7d0ca2e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,12 +1,25 @@@ -3.0.2 +3.2 + * 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 2.2: ++Merged from 3.0: + * Fix upgrade data loss due to range tombstone deleting more data than then should + (CASSANDRA-10822) + Merged from 2.2 * Add property to allow listening on broadcast interface (CASSANDRA-9748) - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) - * Better handling of SSL connection errors inter-node (CASSANDRA-10816) - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) Merged from 2.1: * Make Stress compiles within eclipse (CASSANDRA-10807) * Cassandra Daemon should print JVM arguments (CASSANDRA-10764) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bc36372/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java index 7a2e71f,2234838..fafab69 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@@ -965,8 -968,7 +968,8 @@@ public class CompactionManager implemen expectedBloomFilterSize, repairedAt, sstable.getSSTableLevel(), - sstable.header, + header, + cfs.indexManager.listIndexes(), txn); }
