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 DD1AC18CCC for ; Tue, 1 Sep 2015 22:01:47 +0000 (UTC) Received: (qmail 83842 invoked by uid 500); 1 Sep 2015 22:01:47 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 83766 invoked by uid 500); 1 Sep 2015 22:01:47 -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 83517 invoked by uid 99); 1 Sep 2015 22:01:47 -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, 01 Sep 2015 22:01:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 51078E08E0; Tue, 1 Sep 2015 22:01:47 +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: Tue, 01 Sep 2015 22:01:50 -0000 Message-Id: <2aae625b5bc14651a1cb52d2f9f067bb@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 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/02e5478f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02e5478f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02e5478f Branch: refs/heads/cassandra-3.0 Commit: 02e5478f05178cbc563605dcaa65de60066e046e Parents: 3effec5 2267d79 Author: Yuki Morishita Authored: Tue Sep 1 16:58:13 2015 -0500 Committer: Yuki Morishita Committed: Tue Sep 1 16:58:13 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/streaming/messages/StreamMessage.java | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e5478f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ffff102,681a40b..91ae36c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -2.1.10 +2.2.2 + * Fix repair hang when snapshot failed (CASSANDRA-10057) + * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks + (CASSANDRA-10199) +Merged from 2.1: + * Fix handling of streaming EOF (CASSANDRA-10206) * Only check KeyCache when it is enabled * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611) * (cqlsh) update list of CQL keywords (CASSANDRA-9232) http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e5478f/src/java/org/apache/cassandra/streaming/messages/StreamMessage.java ----------------------------------------------------------------------