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 B8130200B38 for ; Fri, 8 Jul 2016 21:32:05 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B6AFE160A81; Fri, 8 Jul 2016 19:32:05 +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 31073160A78 for ; Fri, 8 Jul 2016 21:32:05 +0200 (CEST) Received: (qmail 37891 invoked by uid 500); 8 Jul 2016 19:32:04 -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 37713 invoked by uid 99); 8 Jul 2016 19:32:04 -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; Fri, 08 Jul 2016 19:32:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 32341E2EE7; Fri, 8 Jul 2016 19:32:04 +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: Fri, 08 Jul 2016 19:32:07 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/5] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Fri, 08 Jul 2016 19:32:05 -0000 Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/512a25fc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/512a25fc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/512a25fc Branch: refs/heads/master Commit: 512a25fc8c8a2b0c0af610502f41fd80ff049b24 Parents: f4d4f57 4d26943 Author: Keith Turner Authored: Fri Jul 8 14:39:37 2016 -0400 Committer: Keith Turner Committed: Fri Jul 8 14:39:37 2016 -0400 ---------------------------------------------------------------------- .../core/file/rfile/bcfile/Compression.java | 312 +++++++++++++++---- .../core/file/rfile/bcfile/CompressionTest.java | 244 +++++++++++++++ 2 files changed, 497 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/512a25fc/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java ----------------------------------------------------------------------