cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [1/6] git commit: Merge branch 'cassandra-1.1' into trunk
Date Tue, 15 May 2012 23:02:40 GMT
Updated Branches:
  refs/heads/cassandra-1.0 be9fa05d0 -> 0077edc94
  refs/heads/cassandra-1.1 51767c198 -> 59a042167
  refs/heads/trunk e0925ac49 -> 34bdc7cc9


Merge branch 'cassandra-1.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34bdc7cc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34bdc7cc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34bdc7cc

Branch: refs/heads/trunk
Commit: 34bdc7cc9cb487355fdc8105e5b1fa376080bfdb
Parents: e0925ac 59a0421
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Tue May 15 18:02:31 2012 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Tue May 15 18:02:31 2012 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/tools/NodeCmd.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/34bdc7cc/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java
index c7befea,90756f1..08ac292
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@@ -333,8 -319,8 +333,9 @@@ public class NodeCm
      {
          boolean gossipInitialized = probe.isInitialized();
          outs.printf("%-17s: %s%n", "Token", probe.getToken());
 +        outs.printf("%-17s: %s%n", "ID", probe.getLocalHostId());
          outs.printf("%-17s: %s%n", "Gossip active", gossipInitialized);
+         outs.printf("%-17s: %s%n", "Thrift active", probe.isThriftServerRunning());
          outs.printf("%-17s: %s%n", "Load", probe.getLoadString());
          if (gossipInitialized)
              outs.printf("%-17s: %s%n", "Generation No", probe.getCurrentGenerationNumber());


Mime
View raw message