From commits-return-22336-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Fri Nov 16 00:44:39 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id DAD63180676 for ; Fri, 16 Nov 2018 00:44:38 +0100 (CET) Received: (qmail 26847 invoked by uid 500); 15 Nov 2018 23:44:38 -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 26831 invoked by uid 99); 15 Nov 2018 23:44:38 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Nov 2018 23:44:38 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 7385487FE0; Thu, 15 Nov 2018 23:44:37 +0000 (UTC) Date: Thu, 15 Nov 2018 23:44:39 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] 01/01: Merge branch '1.9' MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: ctubbsii@apache.org In-Reply-To: <154232547728.14447.6353890813688847507@gitbox.apache.org> References: <154232547728.14447.6353890813688847507@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: a21ea07beb78bbba81bf20418efd6ee82d6185e5 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20181115234437.7385487FE0@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit a21ea07beb78bbba81bf20418efd6ee82d6185e5 Merge: 017d31a ba572b4 Author: Christopher Tubbs AuthorDate: Thu Nov 15 18:43:39 2018 -0500 Merge branch '1.9' .../native/src/main/c++/nativeMap/BlockAllocator.h | 402 ++++++++++----------- server/native/src/main/c++/nativeMap/Field.h | 215 ++++++----- server/native/src/main/c++/nativeMap/Key.h | 208 +++++------ server/native/src/main/c++/nativeMap/NativeMap.h | 329 ++++++++--------- server/native/src/main/c++/nativeMap/SubKey.h | 229 ++++++------ .../org_apache_accumulo_tserver_NativeMap.cc | 102 +++--- 6 files changed, 741 insertions(+), 744 deletions(-)