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 7D73918A2A for ; Tue, 25 Aug 2015 01:00:49 +0000 (UTC) Received: (qmail 80901 invoked by uid 500); 25 Aug 2015 01:00:48 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 80821 invoked by uid 500); 25 Aug 2015 01:00:48 -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 80512 invoked by uid 99); 25 Aug 2015 01:00:48 -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; Tue, 25 Aug 2015 01:00:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 82DABE0F7B; Tue, 25 Aug 2015 01:00:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Tue, 25 Aug 2015 01:00:54 -0000 Message-Id: In-Reply-To: <91d8c43150924e9aba614e6cf821d4ec@git.apache.org> References: <91d8c43150924e9aba614e6cf821d4ec@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/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/27a97a5c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27a97a5c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27a97a5c Branch: refs/heads/cassandra-3.0 Commit: 27a97a5cfe04f3101e542ad75e2c4e7d1344bb81 Parents: 98f414f e667993 Author: Jonathan Ellis Authored: Mon Aug 24 20:00:06 2015 -0500 Committer: Jonathan Ellis Committed: Mon Aug 24 20:00:30 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/27a97a5c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 63387ea,28fe8a2..62ee818 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,36 -1,6 +1,38 @@@ -2.2.1 +3.0.0-beta2 + * Only use batchlog when paired materialized view replica is remote (CASSANDRA-10061) + * Reuse TemporalRow when updating multiple MaterializedViews (CASSANDRA-10060) + * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917) + * Fix sstablerepairedset (CASSANDRA-10132) +Merged from 2.2: ++ * Avoid returning Permission.None when system_auth.permissions table does not ++ exist (CASSANDRA-10168) * add CLEAR cqlsh command (CASSANDRA-10086) * Support string literals as Role names for compatibility (CASSANDRA-10135) + + +3.0.0-beta1 + * Redesign secondary index API (CASSANDRA-9459, 7771, 9041) + * Fix throwing ReadFailure instead of ReadTimeout on range queries (CASSANDRA-10125) + * Rewrite hinted handoff (CASSANDRA-6230) + * Fix query on static compact tables (CASSANDRA-10093) + * Fix race during construction of commit log (CASSANDRA-10049) + * Add option to only purge repaired tombstones (CASSANDRA-6434) + * Change authorization handling for MVs (CASSANDRA-9927) + * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026) + * Fix row deletion bug for Materialized Views (CASSANDRA-10014) + * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704) + * Fix multiple slices on RowSearchers (CASSANDRA-10002) + * Fix bug in merging of collections (CASSANDRA-10001) + * Optimize batchlog replay to avoid full scans (CASSANDRA-7237) + * Repair improvements when using vnodes (CASSANDRA-5220) + * Disable scripted UDFs by default (CASSANDRA-9889) + * Bytecode inspection for Java-UDFs (CASSANDRA-9890) + * Use byte to serialize MT hash length (CASSANDRA-9792) + * Replace usage of Adler32 with CRC32 (CASSANDRA-8684) + * Fix migration to new format from 2.1 SSTable (CASSANDRA-10006) + * SequentialWriter should extend BufferedDataOutputStreamPlus (CASSANDRA-9500) + * Use the same repairedAt timestamp within incremental repair session (CASSANDRA-9111) +Merged from 2.2: * Allow count(*) and count(1) to be use as normal aggregation (CASSANDRA-10114) * An NPE is thrown if the column name is unknown for an IN relation (CASSANDRA-10043) * Apply commit_failure_policy to more errors on startup (CASSANDRA-9749)