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 8CE94200CDF for ; Thu, 17 Aug 2017 21:34:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8B50916B9F6; Thu, 17 Aug 2017 19:34:13 +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 D37CF16B9F7 for ; Thu, 17 Aug 2017 21:34:12 +0200 (CEST) Received: (qmail 36323 invoked by uid 500); 17 Aug 2017 19:34:07 -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 35643 invoked by uid 99); 17 Aug 2017 19:34: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; Thu, 17 Aug 2017 19:34:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 36EC4F5667; Thu, 17 Aug 2017 19:34:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mshuler@apache.org To: commits@cassandra.apache.org Date: Thu, 17 Aug 2017 19:34:13 -0000 Message-Id: <1945fa6eb9304af0882f3633e7f1a6ad@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [09/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 archived-at: Thu, 17 Aug 2017 19:34:13 -0000 Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/830b0127 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/830b0127 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/830b0127 Branch: refs/heads/cassandra-3.11 Commit: 830b01272c227503f74b5fe5a5340331ee3ce685 Parents: 270f690 3c0c462 Author: Michael Shuler Authored: Thu Aug 17 14:24:09 2017 -0500 Committer: Michael Shuler Committed: Thu Aug 17 14:24:09 2017 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + circle.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/830b0127/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f712333,4f8f65f..5c1d1e5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ -2.1.19 - * Remove stress-test target in CircleCI as it's not existing (CASSANDRA-13775) +2.2.11 + * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067) + * Fix queries with LIMIT and filtering on clustering columns (CASSANDRA-11223) + * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272) + * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592) + * Fix nested Tuples/UDTs validation (CASSANDRA-13646) + * Remove unused max_value_size_in_mb config setting from yaml (CASSANDRA-13625 +Merged from 2.1: ++ * Remove stress-test target in CircleCI as it's not existing (CASSANDRA-13775) * Clone HeartBeatState when building gossip messages. Make its generation/version volatile (CASSANDRA-13700) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org For additional commands, e-mail: commits-help@cassandra.apache.org