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 7638C11D3E for ; Mon, 30 Jun 2014 13:45:20 +0000 (UTC) Received: (qmail 92804 invoked by uid 500); 30 Jun 2014 13:45:20 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 92656 invoked by uid 500); 30 Jun 2014 13:45:20 -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 92547 invoked by uid 99); 30 Jun 2014 13:45:19 -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, 30 Jun 2014 13:45:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B935091BC06; Mon, 30 Jun 2014 13:45:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benedict@apache.org To: commits@cassandra.apache.org Date: Mon, 30 Jun 2014 13:45:21 -0000 Message-Id: In-Reply-To: <7653c59a9a98411d9bb6dd0487abc40e@git.apache.org> References: <7653c59a9a98411d9bb6dd0487abc40e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/8] git commit: fix CHANGES.txt fix CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82aca6da Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82aca6da Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82aca6da Branch: refs/heads/trunk Commit: 82aca6dae985e22b9cd8a9c3343da06db720fc5a Parents: da3606e Author: Benedict Elliott Smith Authored: Mon Jun 30 14:42:14 2014 +0100 Committer: Benedict Elliott Smith Committed: Mon Jun 30 14:42:14 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82aca6da/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9a3ac17..6464cd8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,7 +9,7 @@ Merged from 2.0: operations to incorrect become full QUORUM (CASSANDRA-7345) * Properly handle unrecognized opcodes and flags (CASSANDRA-7440) * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459) - + * Commit disk failure policy (CASSANDRA-7429) 2.1.0-rc2 * Fix heap size calculation for CompoundSparseCellName and