Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15ac9e89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15ac9e89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15ac9e89 Branch: refs/heads/trunk Commit: 15ac9e899bf0448c42e2cce9cf867556f161c186 Parents: 5dbab32 c003951 Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Feb 18 12:51:32 2016 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Feb 18 12:51:32 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/compaction/CompactionManager.java | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15ac9e89/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a1125f5,7cbfea7..f68eea5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,8 +1,20 @@@ -2.2.6 +3.0.4 + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721) + * Add query time validation method on Index (CASSANDRA-11043) + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128) + * Properly handle hinted handoff after topology changes (CASSANDRA-5902) + * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156) + * Fix wrong rack counting and invalid conditions check for TokenAllocation + (CASSANDRA-11139) + * Avoid creating empty hint files (CASSANDRA-11090) + * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120) + * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062) + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) + * Add dropped_columns to the list of schema table so it gets handled + properly (CASSANDRA-11050) +Merged from 2.2: + * Better error message for cleanup (CASSANDRA-10991) * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123) - * Use cloned TokenMetadata in size estimates to avoid race against membership check - (CASSANDRA-10736) * Always persist upsampled index summaries (CASSANDRA-10512) * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733) * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048) http://git-wip-us.apache.org/repos/asf/cassandra/blob/15ac9e89/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
