Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 6988A1054B for ; Fri, 6 Dec 2013 06:52:07 +0000 (UTC) Received: (qmail 8929 invoked by uid 500); 6 Dec 2013 03:58:42 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 8915 invoked by uid 500); 6 Dec 2013 03:58:42 -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 8868 invoked by uid 99); 6 Dec 2013 03:58:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Dec 2013 03:58:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EA59382CFB6; Fri, 6 Dec 2013 03:58:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Fri, 06 Dec 2013 03:58:44 -0000 Message-Id: <6b212801b66842d495d3a5e8f42c64f3@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] git commit: Merge branch '1.6.0-SNAPSHOT' Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fd0ff920 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fd0ff920 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fd0ff920 Branch: refs/heads/master Commit: fd0ff92044ad8c02f2a1675c9089cd044e078bcf Parents: 061a641 f65beca Author: Josh Elser Authored: Thu Dec 5 22:52:56 2013 -0500 Committer: Josh Elser Committed: Thu Dec 5 22:52:56 2013 -0500 ---------------------------------------------------------------------- bin/build_native_library.sh | 2 +- .../org/apache/accumulo/core/file/rfile/bcfile/BCFile.java | 2 +- .../src/main/java/org/apache/accumulo/tserver/NativeMap.java | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) ----------------------------------------------------------------------