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 2BF6610756 for ; Tue, 22 Oct 2013 21:56:32 +0000 (UTC) Received: (qmail 41820 invoked by uid 500); 22 Oct 2013 21:53:18 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 41040 invoked by uid 500); 22 Oct 2013 21:52:12 -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 40563 invoked by uid 99); 22 Oct 2013 21:51:10 -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, 22 Oct 2013 21:51:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 413905462D; Tue, 22 Oct 2013 21:51:10 +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, 22 Oct 2013 21:51:10 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: update changes Updated Branches: refs/heads/cassandra-2.0 4155afd51 -> 2629e5e4e refs/heads/trunk dba12f386 -> 6cb5da88a update changes Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2629e5e4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2629e5e4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2629e5e4 Branch: refs/heads/cassandra-2.0 Commit: 2629e5e4ee0afbce6f12d54a1ee301501348d8fb Parents: 4155afd Author: Brandon Williams Authored: Tue Oct 22 16:49:03 2013 -0500 Committer: Brandon Williams Committed: Tue Oct 22 16:49:03 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2629e5e4/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ac4c010..c01b4a8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +2.0.3 + * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571) + + 2.0.2 * Update FailureDetector to use nanontime (CASSANDRA-4925) * Fix FileCacheService regressions (CASSANDRA-6149)