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 9983B10AFA for ; Thu, 18 Jul 2013 23:46:39 +0000 (UTC) Received: (qmail 8451 invoked by uid 500); 18 Jul 2013 23:46:39 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 8368 invoked by uid 500); 18 Jul 2013 23:46:39 -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 8356 invoked by uid 99); 18 Jul 2013 23:46:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jul 2013 23:46:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F23598AE3CB; Thu, 18 Jul 2013 23:46:38 +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: Thu, 18 Jul 2013 23:46:40 -0000 Message-Id: <944e6d53aba74f4091ae68d6b9b98004@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-1.2' into trunk Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6fd5bab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6fd5bab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6fd5bab Branch: refs/heads/trunk Commit: f6fd5bab7550bd8e4abc814f4ab607c9fce4b43c Parents: ee85c8e 373c033 Author: Brandon Williams Authored: Thu Jul 18 18:46:17 2013 -0500 Committer: Brandon Williams Committed: Thu Jul 18 18:46:17 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6fd5bab/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 9d2e89a,d166553..12ba352 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -893,8 -942,9 +893,8 @@@ public class StorageService extends Not // Dont set any state for the node which is bootstrapping the existing token... tokenMetadata.updateNormalTokens(tokens, FBUtilities.getBroadcastAddress()); } - Tracing.instance(); if (!Gossiper.instance.seenAnySeed()) - throw new IllegalStateException("Unable to contact any seeds!") + throw new IllegalStateException("Unable to contact any seeds!"); setMode(Mode.JOINING, "Starting to bootstrap...", true); new BootStrapper(FBUtilities.getBroadcastAddress(), tokens, tokenMetadata).bootstrap(); // handles token update logger.info("Bootstrap completed! for the tokens {}", tokens);