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 BAB4A18818 for ; Thu, 12 Nov 2015 18:07:38 +0000 (UTC) Received: (qmail 89288 invoked by uid 500); 12 Nov 2015 18:07:38 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 89249 invoked by uid 500); 12 Nov 2015 18:07:38 -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 89196 invoked by uid 99); 12 Nov 2015 18:07:38 -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, 12 Nov 2015 18:07:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 36C8CE5E2E; Thu, 12 Nov 2015 18:07:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Thu, 12 Nov 2015 18:07:42 -0000 Message-Id: In-Reply-To: <86e6409cf9c8410cbf1b6f68f9fbf017@git.apache.org> References: <86e6409cf9c8410cbf1b6f68f9fbf017@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] cassandra git commit: Merge branch 'cassandra-3.1' into trunk Merge branch 'cassandra-3.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/7fcf14fa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fcf14fa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fcf14fa Branch: refs/heads/trunk Commit: 7fcf14faa4ea0f38840894e371bfda3a2d4c54fb Parents: 7cb33aa e11bd0f Author: Aleksey Yeschenko Authored: Thu Nov 12 18:07:36 2015 +0000 Committer: Aleksey Yeschenko Committed: Thu Nov 12 18:07:36 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 5 +++ .../cassandra/service/StorageServiceMBean.java | 5 +++ .../org/apache/cassandra/tools/NodeProbe.java | 12 +++++++ .../org/apache/cassandra/tools/NodeTool.java | 3 +- .../tools/nodetool/RefreshSizeEstimates.java | 33 ++++++++++++++++++++ 6 files changed, 58 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fcf14fa/CHANGES.txt ----------------------------------------------------------------------