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 C5BEC200B13 for ; Wed, 1 Jun 2016 01:11:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C4623160A48; Tue, 31 May 2016 23:11:21 +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 1A2B3160A46 for ; Wed, 1 Jun 2016 01:11:20 +0200 (CEST) Received: (qmail 52267 invoked by uid 500); 31 May 2016 23:11:20 -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 52246 invoked by uid 99); 31 May 2016 23:11:20 -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, 31 May 2016 23:11:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 347CFDFE61; Tue, 31 May 2016 23:11:20 +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, 31 May 2016 23:11:21 -0000 Message-Id: <25cd25d4441240c287c64535c06a1b21@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] accumulo git commit: Merge branch '1.6' into 1.7 archived-at: Tue, 31 May 2016 23:11:21 -0000 Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d33b2a09 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d33b2a09 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d33b2a09 Branch: refs/heads/1.8 Commit: d33b2a09db1336d0734a3dc4f034c910ed751025 Parents: d10840b 63a8a5d Author: Keith Turner Authored: Tue May 31 18:50:37 2016 -0400 Committer: Keith Turner Committed: Tue May 31 18:50:37 2016 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/file/rfile/RFile.java | 32 ++++++++-- .../accumulo/core/file/rfile/RFileTest.java | 63 ++++++++++++++++++++ 2 files changed, 91 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d33b2a09/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java ---------------------------------------------------------------------- diff --cc core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java index 060d956,2fc4e4a..af9011d --- a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java +++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java @@@ -64,9 -64,9 +64,10 @@@ import org.apache.accumulo.core.iterato import org.apache.accumulo.core.iterators.system.LocalityGroupIterator.LocalityGroup; import org.apache.accumulo.core.util.MutableByteSequence; import org.apache.commons.lang.mutable.MutableLong; + import org.apache.commons.math.stat.descriptive.SummaryStatistics; import org.apache.hadoop.io.Writable; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RFile { http://git-wip-us.apache.org/repos/asf/accumulo/blob/d33b2a09/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java ----------------------------------------------------------------------