Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 843BC18404 for ; Wed, 14 Oct 2015 14:23:22 +0000 (UTC) Received: (qmail 53583 invoked by uid 500); 14 Oct 2015 14:23:19 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 53486 invoked by uid 500); 14 Oct 2015 14:23:19 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 53139 invoked by uid 99); 14 Oct 2015 14:23:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Oct 2015 14:23:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CC7AAE0664; Wed, 14 Oct 2015 14:23:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Wed, 14 Oct 2015 14:23:21 -0000 Message-Id: <98c2c063fbe0482096943160f03f9bc4@git.apache.org> In-Reply-To: <0dd68a09c0d24a65931349d870452e53@git.apache.org> References: <0dd68a09c0d24a65931349d870452e53@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 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/6d0c96c4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d0c96c4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d0c96c4 Branch: refs/heads/trunk Commit: 6d0c96c4d6d86f3a006f4520114e957cece38b85 Parents: 26c8892 751e4f9 Author: Aleksey Yeschenko Authored: Wed Oct 14 15:22:49 2015 +0100 Committer: Aleksey Yeschenko Committed: Wed Oct 14 15:22:49 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 3 +++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d0c96c4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 84b85cf,6aa16bc..d0b90ef --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -12,39 -7,27 +12,40 @@@ Merged from 2.2 * Avoid NoClassDefFoundError during DataDescriptor initialization on windows (CASSANDRA-10412) * Preserve case of quoted Role & User names (CASSANDRA-10394) * cqlsh pg-style-strings broken (CASSANDRA-10484) - * Make Hadoop CF splits more polite to custom orderered partitioners (CASSANDRA-10400) - * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487) + * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369) Merged from 2.1: - * Fix mmap file segment seeking to EOF (CASSANDRA-10478) ++ * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275) * Mark nodes as dead even if they've already left (CASSANDRA-10205) - * Update internal python driver used by cqlsh (CASSANDRA-10161, CASSANDRA-10507) -2.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: * Bulk Loader API could not tolerate even node failure (CASSANDRA-10347) * Avoid misleading pushed notifications when multiple nodes http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d0c96c4/bin/cqlsh.py ----------------------------------------------------------------------