cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [2/5] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Sun, 23 Mar 2014 02:27:58 GMT
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 <vijay2win@gmail.com>
Authored: Sat Mar 22 19:02:05 2014 -0700
Committer: Vijay <vijay2win@gmail.com>
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)


Mime
View raw message