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/0663ebbd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0663ebbd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0663ebbd Branch: refs/heads/cassandra-3.0 Commit: 0663ebbd797cc6bd3d9e55537c19e28ea9851d13 Parents: 7a435c3 e4fb1de Author: Jason Brown <jasedbr...@gmail.com> Authored: Fri Feb 5 14:03:42 2016 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Fri Feb 5 14:03:42 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- src/java/org/apache/cassandra/gms/Gossiper.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0663ebbd/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d773c9d,0d98779..48321f1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,44 -1,6 +1,45 @@@ -2.2.6 +3.0.4 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) - ++Merged from 2.2.6 + * Gossiper#isEnabled is not thread safe (CASSANDRA-11116) - * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010) + +3.0.3 + * Remove double initialization of newly added tables (CASSANDRA-11027) + * Filter keys searcher results by target range (CASSANDRA-11104) + * Fix deserialization of legacy read commands (CASSANDRA-11087) + * Fix incorrect computation of deletion time in sstable metadata (CASSANDRA-11102) + * Avoid memory leak when collecting sstable metadata (CASSANDRA-11026) + * Mutations do not block for completion under view lock contention (CASSANDRA-10779) + * Invalidate legacy schema tables when unloading them (CASSANDRA-11071) + * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly + (CASSANDRA-11003) + * Fix DISTINCT queries in mixed version clusters (CASSANDRA-10762) + * Migrate build status for indexes along with legacy schema (CASSANDRA-11046) + * Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045) + * Added support for IBM zSystems architecture (CASSANDRA-11054) + * Update CQL documentation (CASSANDRA-10899) + * Check the column name, not cell name, for dropped columns when reading + legacy sstables (CASSANDRA-11018) + * Don't attempt to index clustering values of static rows (CASSANDRA-11021) + * Remove checksum files after replaying hints (CASSANDRA-10947) + * Support passing base table metadata to custom 2i validation (CASSANDRA-10924) + * Ensure stale index entries are purged during reads (CASSANDRA-11013) + * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954) + * Fix UnsupportedOperationException when reading old sstable with range + 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 * maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949) * Apply change to compaction throughput in real time (CASSANDRA-10025) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0663ebbd/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
