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 12B6D200B25 for ; Wed, 8 Jun 2016 23:56:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1157D160A54; Wed, 8 Jun 2016 21:56:41 +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 82564160A0E for ; Wed, 8 Jun 2016 23:56:40 +0200 (CEST) Received: (qmail 31603 invoked by uid 500); 8 Jun 2016 21:56:39 -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 31585 invoked by uid 99); 8 Jun 2016 21:56:39 -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; Wed, 08 Jun 2016 21:56:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8BCFAE0902; Wed, 8 Jun 2016 21:56:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: busbey@apache.org To: commits@accumulo.apache.org Date: Wed, 08 Jun 2016 21:56:41 -0000 Message-Id: <39e4bdac752a4e26b1cbf6eaf5bcf06a@git.apache.org> In-Reply-To: <348adc879caa49c287f9d2df4171aabb@git.apache.org> References: <348adc879caa49c287f9d2df4171aabb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] accumulo git commit: Merge branch '1.8' archived-at: Wed, 08 Jun 2016 21:56:41 -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/635f5403 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/635f5403 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/635f5403 Branch: refs/heads/master Commit: 635f54030df0999a46a2337aa2d95abcc85904d9 Parents: 3592b38 eff4547 Author: Sean Busbey Authored: Wed Jun 8 16:42:36 2016 -0500 Committer: Sean Busbey Committed: Wed Jun 8 16:42:36 2016 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/rpc/TServerUtils.java | 2 +- .../main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +- .../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 4 ++-- .../java/org/apache/accumulo/tserver/log/TabletServerLogger.java | 2 +- .../java/org/apache/accumulo/tserver/scan/NextBatchTask.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/635f5403/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java ----------------------------------------------------------------------