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 8316310442 for ; Sun, 23 Mar 2014 02:28:03 +0000 (UTC) Received: (qmail 45821 invoked by uid 500); 23 Mar 2014 02:28:00 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 45699 invoked by uid 500); 23 Mar 2014 02:27:59 -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 45666 invoked by uid 99); 23 Mar 2014 02:27:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Mar 2014 02:27:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B46C5948EFA; Sun, 23 Mar 2014 02:27:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vijay@apache.org To: commits@cassandra.apache.org Date: Sun, 23 Mar 2014 02:27:58 -0000 Message-Id: <008c9bcba571469ba1ef81cc5975885b@git.apache.org> In-Reply-To: <79557faef1bb427db62702f1e5ae986e@git.apache.org> References: <79557faef1bb427db62702f1e5ae986e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0 Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7231ff8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7231ff8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7231ff8 Branch: refs/heads/trunk Commit: b7231ff8a66160e223f259488609023805582c2e Parents: 1fbdb48 b7bb2fb Author: Vijay Authored: Sat Mar 22 19:02:05 2014 -0700 Committer: Vijay Committed: Sat Mar 22 19:02:05 2014 -0700 ---------------------------------------------------------------------- .../org/apache/cassandra/tools/NodeCmd.java | 35 ++++++++++---------- 1 file changed, 18 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7231ff8/src/java/org/apache/cassandra/tools/NodeCmd.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java index 3404082,6c02877..8c6b4c9 --- a/src/java/org/apache/cassandra/tools/NodeCmd.java +++ b/src/java/org/apache/cassandra/tools/NodeCmd.java @@@ -314,10 -304,15 +314,10 @@@ public class NodeCm for (HostStat stat : hoststats) { - tokens.addAll(endpointsToTokens.get(stat.ip)); + tokens.addAll(endpointsToTokens.get(stat.endpoint.getHostAddress())); lastToken = tokens.get(tokens.size() - 1); - if (stat.owns != null) - totalReplicas += stat.owns; } - if (keyspaceSelected) - outs.print("Replicas: " + (int) totalReplicas + "\n\n"); - outs.printf(format, "Address", "Rack", "Status", "State", "Load", "Owns", "Token"); if (hoststats.size() > 1)