Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 46FD0200C30 for ; Tue, 7 Mar 2017 23:10:02 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 459D1160B82; Tue, 7 Mar 2017 22:10:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BC4D3160B74 for ; Tue, 7 Mar 2017 23:10:01 +0100 (CET) Received: (qmail 28469 invoked by uid 500); 7 Mar 2017 22:10:00 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 28408 invoked by uid 99); 7 Mar 2017 22:10:00 -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; Tue, 07 Mar 2017 22:10:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B3028DFF41; Tue, 7 Mar 2017 22:10:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@accumulo.apache.org Date: Tue, 07 Mar 2017 22:10:02 -0000 Message-Id: <0a3cc149b8c842a6bd27a53667acff93@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] accumulo git commit: Merge branch '1.8' archived-at: Tue, 07 Mar 2017 22:10:02 -0000 Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/861db793 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/861db793 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/861db793 Branch: refs/heads/master Commit: 861db793dbfb4f13e18011fb42f28ddcb84765fd Parents: a1cf8e2 7ca6332 Author: Keith Turner Authored: Tue Mar 7 16:10:39 2017 -0500 Committer: Keith Turner Committed: Tue Mar 7 16:10:39 2017 -0500 ---------------------------------------------------------------------- .../accumulo/core/file/rfile/PrintInfo.java | 7 +- .../apache/accumulo/core/file/rfile/RFile.java | 18 ++++-- .../accumulo/core/util/LocalityGroupUtil.java | 35 ++++++++++ .../core/file/rfile/RFileMetricsTest.java | 68 ++++++++++++++++++-- 4 files changed, 116 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/861db793/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java ----------------------------------------------------------------------