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 ABA9B10323 for ; Mon, 15 Jul 2013 21:10:52 +0000 (UTC) Received: (qmail 11647 invoked by uid 500); 15 Jul 2013 21:10:52 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 11611 invoked by uid 500); 15 Jul 2013 21:10:52 -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 11575 invoked by uid 99); 15 Jul 2013 21:10:52 -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, 15 Jul 2013 21:10:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E5FF68A827B; Mon, 15 Jul 2013 21:10:51 +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: Mon, 15 Jul 2013 21:10:52 -0000 Message-Id: <2fd593be299749cc9db925bc8ba05bab@git.apache.org> In-Reply-To: <53362c8edd6c4c019b68de17f41ecf32@git.apache.org> References: <53362c8edd6c4c019b68de17f41ecf32@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: fix build fix build Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6145668 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6145668 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6145668 Branch: refs/heads/trunk Commit: d6145668c6cee8e30246f912ee58e8cd2ffdb9ba Parents: ba6396a Author: Brandon Williams Authored: Mon Jul 15 16:10:23 2013 -0500 Committer: Brandon Williams Committed: Mon Jul 15 16:10:23 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6145668/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 91ae675..55d78b8 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -728,7 +728,7 @@ public class DatabaseDescriptor public static boolean isReplacing() { - return 0 != getReplaceTokens().size() || getReplaceNode() != null + return 0 != getReplaceTokens().size() || getReplaceNode() != null; } public static String getClusterName()