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 A43DC107A0 for ; Tue, 29 Apr 2014 04:39:28 +0000 (UTC) Received: (qmail 376 invoked by uid 500); 29 Apr 2014 04:39:28 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 353 invoked by uid 500); 29 Apr 2014 04:39:28 -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 320 invoked by uid 99); 29 Apr 2014 04:39:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Apr 2014 04:39:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E74B6994856; Tue, 29 Apr 2014 04:39:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vijay@apache.org To: commits@cassandra.apache.org Date: Tue, 29 Apr 2014 04:39:29 -0000 Message-Id: In-Reply-To: <63e87466907c471780641b370de97f01@git.apache.org> References: <63e87466907c471780641b370de97f01@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.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/b2ef5647 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2ef5647 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2ef5647 Branch: refs/heads/trunk Commit: b2ef56478d5be36d5e20932428698ed930b9b992 Parents: afe2e14 d402cf6 Author: Vijay Authored: Mon Apr 28 21:39:20 2014 -0700 Committer: Vijay Committed: Mon Apr 28 21:39:20 2014 -0700 ---------------------------------------------------------------------- conf/logback.xml | 2 +- .../cassandra/service/StorageService.java | 49 ++++++++++++++++++-- .../cassandra/service/StorageServiceMBean.java | 21 ++++++++- .../org/apache/cassandra/tools/NodeProbe.java | 17 +++++++ .../org/apache/cassandra/tools/NodeTool.java | 32 ++++++++++++- 5 files changed, 114 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2ef5647/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------