Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7074ddab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7074ddab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7074ddab Branch: refs/heads/cassandra-3.3 Commit: 7074ddab84e37c232710cafc1ab06a812ef3f226 Parents: 83ad9ce e1cc015 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Jan 22 16:25:05 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Jan 22 16:25:05 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java | 25 +++++++++++++------- .../cassandra/service/StorageService.java | 1 + 3 files changed, 19 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7074ddab/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2e1f8c3,4a0bca8..94b723c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -15,8 -11,19 +15,9 @@@ Merged from 3.0 tombstone (CASSANDRA-10743) * MV should use the maximum timestamp of the primary key (CASSANDRA-10910) * Fix potential assertion error during compaction (CASSANDRA-10944) - * Fix counting of received sstables in streaming (CASSANDRA-10949) - * Implement hints compression (CASSANDRA-9428) - * Fix potential assertion error when reading static columns (CASSANDRA-10903) - * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711) - * Avoid building PartitionUpdate in toString (CASSANDRA-10897) - * Reduce heap spent when receiving many SSTables (CASSANDRA-10797) - * Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873) - * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653) - * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837) - * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806) Merged from 2.2: -2.2.5 + * Apply change to compaction throughput in real time (CASSANDRA-10025) + * (cqlsh) encode input correctly when saving history * Fix potential NPE on ORDER BY queries with IN (CASSANDRA-10955) * Start L0 STCS-compactions even if there is a L0 -> L1 compaction going (CASSANDRA-10979) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7074ddab/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7074ddab/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
