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 A404CDC4C for ; Mon, 24 Sep 2012 15:47:48 +0000 (UTC) Received: (qmail 59796 invoked by uid 500); 24 Sep 2012 15:47:48 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 59716 invoked by uid 500); 24 Sep 2012 15:47:48 -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 59364 invoked by uid 99); 24 Sep 2012 15:47:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Sep 2012 15:47:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7E63439436; Mon, 24 Sep 2012 15:47:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [4/9] git commit: fix CHANGES for #4708 Message-Id: <20120924154747.7E63439436@tyr.zones.apache.org> Date: Mon, 24 Sep 2012 15:47:47 +0000 (UTC) fix CHANGES for #4708 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f51c70e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f51c70e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f51c70e Branch: refs/heads/trunk Commit: 4f51c70e12754b03f3af5188875ddded49c84e4c Parents: cad3237 Author: Jonathan Ellis Authored: Mon Sep 24 10:46:25 2012 -0500 Committer: Jonathan Ellis Committed: Mon Sep 24 10:46:25 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f51c70e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 44db06e..884eaba 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,6 @@ 1.0.12 * Switch from NBHM to CHM in MessagingService's callback map, which + prevents OOM in long-running instances (CASSANDRA-4708) * increase Xss to 160k to accomodate latest 1.6 JVMs (CASSANDRA-4602) * fix toString of hint destination tokens (CASSANDRA-4568) * (Hadoop) fix setting key length for old-style mapred api (CASSANDRA-4534)