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 36282109B6 for ; Tue, 25 Mar 2014 18:19:41 +0000 (UTC) Received: (qmail 13536 invoked by uid 500); 25 Mar 2014 18:19:40 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 13297 invoked by uid 500); 25 Mar 2014 18:19:40 -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 13265 invoked by uid 99); 25 Mar 2014 18:19:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Mar 2014 18:19:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5D729919DC0; Tue, 25 Mar 2014 18:19:37 +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 Date: Tue, 25 Mar 2014 18:19:38 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: typo typo Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f9d0505 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f9d0505 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f9d0505 Branch: refs/heads/cassandra-2.1 Commit: 4f9d0505a86153dd7006cc18611fb2096425d44f Parents: ad81cab Author: Jonathan Ellis Authored: Fri Mar 21 22:11:22 2014 -0500 Committer: Jonathan Ellis Committed: Tue Mar 25 13:19:24 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f9d0505/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 81fba5f..373544c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -247,7 +247,7 @@ Merged from 1.2: 2.0.2 * Update FailureDetector to use nanontime (CASSANDRA-4925) * Fix FileCacheService regressions (CASSANDRA-6149) - * Never return WriteTimeout for CL.ANY (CASSANDRA-6032) + * Never return WriteTimeout for CL.ANY (CASSANDRA-6132) * Fix race conditions in bulk loader (CASSANDRA-6129) * Add configurable metrics reporting (CASSANDRA-4430) * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)