Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C0017200C0D for ; Mon, 16 Jan 2017 17:37:08 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BE932160B59; Mon, 16 Jan 2017 16:37:08 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 14290160B57 for ; Mon, 16 Jan 2017 17:37:07 +0100 (CET) Received: (qmail 6987 invoked by uid 500); 16 Jan 2017 16:37:06 -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 6660 invoked by uid 99); 16 Jan 2017 16:37:06 -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; Mon, 16 Jan 2017 16:37:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 55770F1741; Mon, 16 Jan 2017 16:37:06 +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: Mon, 16 Jan 2017 16:37:13 -0000 Message-Id: <8eadb316fa0644bdad1aa8ca64c16e1c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X archived-at: Mon, 16 Jan 2017 16:37:08 -0000 Merge branch 'cassandra-3.11' into cassandra-3.X Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7c19c60 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7c19c60 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7c19c60 Branch: refs/heads/cassandra-3.X Commit: e7c19c609a8d708cd3b36d80ff44376f3a7554a8 Parents: 92cb311 e63c7a0 Author: Yuki Morishita Authored: Mon Jan 16 10:35:35 2017 -0600 Committer: Yuki Morishita Committed: Mon Jan 16 10:35:35 2017 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/UnfilteredDeserializer.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7c19c60/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f1343b8,9c0b51b..3a0c78d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -132,8 -111,8 +132,9 @@@ * Restore resumable hints delivery (CASSANDRA-11960) * Properly report LWT contention (CASSANDRA-12626) Merged from 3.0: + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203) * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620) * Add parent repair session id to anticompaction log message (CASSANDRA-12186) * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905)