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 90AB895F0 for ; Tue, 6 Mar 2012 05:57:51 +0000 (UTC) Received: (qmail 5818 invoked by uid 500); 6 Mar 2012 05:57:51 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 5661 invoked by uid 500); 6 Mar 2012 05:57:51 -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 5639 invoked by uid 99); 6 Mar 2012 05:57:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2012 05:57:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2012 05:57:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 47511596D; Tue, 6 Mar 2012 05:57:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scode@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Correct CHANGES.txt to reflect CASSANDRA-3671 correctly. Message-Id: <20120306055729.47511596D@tyr.zones.apache.org> Date: Tue, 6 Mar 2012 05:57:29 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/cassandra-1.1 9c5ac8ff6 -> fb7dfc914 Correct CHANGES.txt to reflect CASSANDRA-3671 correctly. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb7dfc91 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb7dfc91 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb7dfc91 Branch: refs/heads/cassandra-1.1 Commit: fb7dfc91442602370289320e5a445b0a0bdc7473 Parents: 9c5ac8f Author: Peter Schuller Authored: Mon Mar 5 21:56:41 2012 -0800 Committer: Peter Schuller Committed: Mon Mar 5 21:56:41 2012 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7dfc91/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 75123a8..42bf195 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,7 @@ 1.1.1-dev * optimize commitlog checksumming (CASSANDRA-3610) * identify and blacklist corrupted SSTables from future compactions (CASSANDRA-2261) + * expose counters for unavailable/timeout exceptions given to thrift clients (CASSANDRA-3671) 1.1-dev @@ -23,7 +24,6 @@ * Fix race between writes and read for cache (CASSANDRA-3862) * perform static initialization of StorageProxy on start-up (CASSANDRA-3797) * support trickling fsync() on writes (CASSANDRA-3950) - * expose counters for unavailable/timeout exceptions given to thrift clients (CASSANDRA-3671) Merged from 1.0: * remove the wait on hint future during write (CASSANDRA-3870) * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933)