Updated Branches: refs/heads/cassandra-1.1 4a4e707ae -> b565fdbdc refs/heads/cassandra-1.1.0 d3c5dbdd6 -> c38d32638 refs/heads/trunk 1c9637f45 -> 9f0b09b00
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/9f0b09b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f0b09b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f0b09b0 Branch: refs/heads/trunk Commit: 9f0b09b00e46befa470d1aab0a8d4397a9c0d056 Parents: 1c9637f b565fdb Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Mar 26 13:27:05 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Mar 26 13:27:05 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 5 +++++ .../cassandra/service/StorageServiceMBean.java | 7 +++++++ src/java/org/apache/cassandra/tools/NodeCmd.java | 1 + src/java/org/apache/cassandra/tools/NodeProbe.java | 5 +++++ 4 files changed, 18 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f0b09b0/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 9c08ab9,584dbed..5e5d4cb --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -1641,9 -1642,14 +1641,14 @@@ public class StorageService implements return FBUtilities.getReleaseVersionString(); } + public String getSchemaVersion() + { + return Schema.instance.getVersion().toString(); + } + public List<String> getLeavingNodes() { - return stringify(tokenMetadata_.getLeavingEndpoints()); + return stringify(tokenMetadata.getLeavingEndpoints()); } public List<String> getMovingNodes() http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f0b09b0/src/java/org/apache/cassandra/service/StorageServiceMBean.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f0b09b0/src/java/org/apache/cassandra/tools/NodeCmd.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f0b09b0/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------
