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 E23FB18A63 for ; Thu, 24 Sep 2015 21:49:47 +0000 (UTC) Received: (qmail 63703 invoked by uid 500); 24 Sep 2015 21:49:46 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 63626 invoked by uid 500); 24 Sep 2015 21:49:46 -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 63237 invoked by uid 99); 24 Sep 2015 21:49:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Sep 2015 21:49:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 29979E0A00; Thu, 24 Sep 2015 21:49:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmckenzie@apache.org To: commits@cassandra.apache.org Date: Thu, 24 Sep 2015 21:49:53 -0000 Message-Id: <3086224caef54243b388bf5afc23c1c4@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [09/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 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 Authored: Thu Sep 24 14:45:43 2015 -0700 Committer: Joshua McKenzie 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 getHostIdMap(); + public Map getEndpointToHostId(); + + /** Retrieve the mapping of host ID to endpoint */ + public Map 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 ----------------------------------------------------------------------