Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fe40a11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fe40a11 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fe40a11 Branch: refs/heads/trunk Commit: 5fe40a1178c2896822a51adc28c1ee6c95efc2ff Parents: 4a849ef 6039d0e Author: Joshua McKenzie <jmcken...@apache.org> Authored: Thu Sep 24 14:45:43 2015 -0700 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Thu Sep 24 14:45:43 2015 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++- .../org/apache/cassandra/service/StorageServiceMBean.java | 5 ++++- src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe40a11/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe40a11/src/java/org/apache/cassandra/service/StorageServiceMBean.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageServiceMBean.java index 2bbc999,7e74947..6dc5a9f --- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java +++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java @@@ -159,8 -159,18 +159,11 @@@ public interface StorageServiceMBean ex public String getLocalHostId(); /** Retrieve the mapping of endpoint to host ID */ - public Map<String, String> getHostIdMap(); + public Map<String, String> getEndpointToHostId(); + + /** Retrieve the mapping of host ID to endpoint */ + public Map<String, String> getHostIdToEndpoint(); - /** - * Numeric load value. - * @see org.apache.cassandra.metrics.StorageMetrics#load - */ - @Deprecated - public double getLoad(); - /** Human-readable load value */ public String getLoadString(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe40a11/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------
