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/a039b7df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a039b7df Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a039b7df Branch: refs/heads/trunk Commit: a039b7df55d8f5d765e1462eace23646eee7b82f Parents: 3ae01dd 7452b20 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Wed Sep 30 10:50:03 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Wed Sep 30 10:50:03 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/transport/Event.java | 29 +++++--- .../org/apache/cassandra/transport/Server.java | 71 +++++++++++++------- 3 files changed, 70 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a039b7df/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index cbd4632,45070b2..96ce6a5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,36 -1,18 +1,38 @@@ -2.2.2 +3.0 +Merged from 2.2: * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369) + + +3.0.0-rc1 + * Fix mixed version read request compatibility for compact static tables + (CASSANDRA-10373) + * Fix paging of DISTINCT with static and IN (CASSANDRA-10354) + * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key + columns (CASSANDRA-9664) + * Move crc_check_chance out of compression options (CASSANDRA-9839) + * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301) + * Transfer hints to a different node on decommission (CASSANDRA-10198) + * Check partition keys for CAS operations during stmt validation (CASSANDRA-10338) + * Add custom query expressions to SELECT (CASSANDRA-10217) + * Fix minor bugs in MV handling (CASSANDRA-10362) + * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124) + * Improve MV schema representation (CASSANDRA-9921) + * Add flag to enable/disable coordinator batchlog for MV writes (CASSANDRA-10230) + * Update cqlsh COPY for new internal driver serialization interface (CASSANDRA-10318) + * Give index implementations more control over rebuild operations (CASSANDRA-10312) + * Update index file format (CASSANDRA-10314) + * Add "shadowable" row tombstones to deal with mv timestamp issues (CASSANDRA-10261) + * CFS.loadNewSSTables() broken for pre-3.0 sstables + * Cache selected index in read command to reduce lookups (CASSANDRA-10215) + * Small optimizations of sstable index serialization (CASSANDRA-10232) + * Support for both encrypted and unencrypted native transport connections (CASSANDRA-9590) +Merged from 2.2: * Configurable page size in cqlsh (CASSANDRA-9855) * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761) - * Cancel transaction for sstables we wont redistribute index summary - for (CASSANDRA-10270) - * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) - * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222) - * Fix failure to start with space in directory path on Windows (CASSANDRA-10239) - * Fix repair hang when snapshot failed (CASSANDRA-10057) - * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks - (CASSANDRA-10199) + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) Merged from 2.1: + * Avoid misleading pushed notifications when multiple nodes + share an rpc_address (CASSANDRA-10052) * Fix dropping undroppable when message queue is full (CASSANDRA-10113) * Fix potential ClassCastException during paging (CASSANDRA-10352) * Prevent ALTER TYPE from creating circular references (CASSANDRA-10339) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a039b7df/src/java/org/apache/cassandra/transport/Event.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a039b7df/src/java/org/apache/cassandra/transport/Server.java ----------------------------------------------------------------------
