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 531A9200D40 for ; Sat, 18 Nov 2017 14:18:35 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 51B24160BE9; Sat, 18 Nov 2017 13:18:35 +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 8E0EA160C0C for ; Sat, 18 Nov 2017 14:18:34 +0100 (CET) Received: (qmail 58132 invoked by uid 500); 18 Nov 2017 13:18:33 -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 57870 invoked by uid 99); 18 Nov 2017 13:18:33 -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; Sat, 18 Nov 2017 13:18:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A8D9EF5F39; Sat, 18 Nov 2017 13:18:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Sat, 18 Nov 2017 13:18:36 -0000 Message-Id: <4f01abc1cc2d43dda5190f7dfb5a9844@git.apache.org> In-Reply-To: <8a8390c228174f7b973be55662273915@git.apache.org> References: <8a8390c228174f7b973be55662273915@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11 archived-at: Sat, 18 Nov 2017 13:18:35 -0000 Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: Fix serialized size of DataLimits Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d2bc37f4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2bc37f4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2bc37f4 Branch: refs/heads/cassandra-3.11 Commit: d2bc37f43db14661a159406e421985a2484d5387 Parents: 9ee44db eb05025 Author: Sylvain Lebresne Authored: Sat Nov 18 14:17:43 2017 +0100 Committer: Sylvain Lebresne Committed: Sat Nov 18 14:17:43 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/TypeSizes.java | 6 ++++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2bc37f4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a1a1a37,6c50a3f..3fc934e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ -3.0.16 +3.11.2 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193) + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897) + * Update jackson JSON jars (CASSANDRA-13949) + * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930) +Merged from 3.0: + * Fix serialized size of DataLimits (CASSANDRA-14057) * Add flag to allow dropping oversized read repair mutations (CASSANDRA-13975) * Fix SSTableLoader logger message (CASSANDRA-14003) * Fix repair race that caused gossip to block (CASSANDRA-13849) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org For additional commands, e-mail: commits-help@cassandra.apache.org