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 577D31889F for ; Fri, 11 Mar 2016 22:50:37 +0000 (UTC) Received: (qmail 45250 invoked by uid 500); 11 Mar 2016 22:50:36 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 45186 invoked by uid 500); 11 Mar 2016 22:50:36 -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 44791 invoked by uid 99); 11 Mar 2016 22:50:36 -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; Fri, 11 Mar 2016 22:50:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3F2D7DFBDB; Fri, 11 Mar 2016 22:50:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Fri, 11 Mar 2016 22:50:42 -0000 Message-Id: <4f13471e2e5741d2862db62c9f972100@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/10] 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/854a243a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/854a243a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/854a243a Branch: refs/heads/trunk Commit: 854a243af91d1e5ca16ac7c03e5a437187323095 Parents: 2d48ddf 971d649 Author: Yuki Morishita Authored: Fri Mar 11 16:27:42 2016 -0600 Committer: Yuki Morishita Committed: Fri Mar 11 16:27:42 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 5 +++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/854a243a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 541f11c,b37ef84..3b5e51f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,7 +1,12 @@@ -2.2.6 +3.0.5 + * Fix sstabledump to include missing info in debug output (CASSANDRA-11321) + * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331) + * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208) + * Remove recursive call from CompositesSearcher (CASSANDRA-11304) + * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377) + * Fix sstableloader fail when using materialized view (CASSANDRA-11275) +Merged from 2.2: + * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092) - * Fix intra-node serialization issue for multicolumn-restrictions (CASSANDRA-11196) - * Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301) * Add missing newline at end of bin/cqlsh (CASSANDRA-11325) * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297) * Unresolved hostname leads to replace being ignored (CASSANDRA-11210) http://git-wip-us.apache.org/repos/asf/cassandra/blob/854a243a/bin/cqlsh.py ----------------------------------------------------------------------