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 DB8CB17808 for ; Tue, 12 May 2015 23:40:29 +0000 (UTC) Received: (qmail 95958 invoked by uid 500); 12 May 2015 23:40:29 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 95907 invoked by uid 500); 12 May 2015 23:40:29 -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 95885 invoked by uid 99); 12 May 2015 23:40:29 -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, 12 May 2015 23:40:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2BF4AE17DD; Tue, 12 May 2015 23:40:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Tue, 12 May 2015 23:40:31 -0000 Message-Id: <3d4bfe5548b1484ba26127ab44d4683a@git.apache.org> In-Reply-To: <88c25811c4184651bd441d2fed3fd684@git.apache.org> References: <88c25811c4184651bd441d2fed3fd684@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] cassandra git commit: Update changes for backport Update changes for backport Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27c2088e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27c2088e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27c2088e Branch: refs/heads/trunk Commit: 27c2088e6159220aad9e2bbf6fc7cd733d1828d7 Parents: 68b2d28 Author: Brandon Williams Authored: Tue May 12 18:40:15 2015 -0500 Committer: Brandon Williams Committed: Tue May 12 18:40:15 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/27c2088e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index e4956c9..e99799d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,7 +3,6 @@ * Don't start Thrift rpc by default (CASSANDRA-9319) * Only stream from unrepaired sstables with incremental repair (CASSANDRA-8267) * Aggregate UDFs allow SFUNC return type to differ from STYPE if FFUNC specified (CASSANDRA-9321) - * Failure detector detects and ignores local pauses (CASSANDRA-9183) * Remove Thrift dependencies in bundled tools (CASSANDRA-8358) * Disable memory mapping of hsperfdata file for JVM statistics (CASSANDRA-9242) * Add pre-startup checks to detect potential incompatibilities (CASSANDRA-8049) @@ -104,6 +103,7 @@ 2.1.6 + * Failure detector detects and ignores local pauses (CASSANDRA-9183) * Add utility class to support for rate limiting a given log statement (CASSANDRA-9029) * Add missing consistency levels to cassandra-stess (CASSANDRA-9361) * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339)