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 1D9A4200B53 for ; Tue, 21 Jun 2016 01:49:56 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1C879160A65; Mon, 20 Jun 2016 23:49:56 +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 344E9160A6E for ; Tue, 21 Jun 2016 01:49:55 +0200 (CEST) Received: (qmail 15644 invoked by uid 500); 20 Jun 2016 23:49:54 -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 14798 invoked by uid 99); 20 Jun 2016 23:49:54 -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; Mon, 20 Jun 2016 23:49:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9CCBFED317; Mon, 20 Jun 2016 23:49:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Mon, 20 Jun 2016 23:50:08 -0000 Message-Id: <057a411721224f7180ca2ee1ebd6441f@git.apache.org> In-Reply-To: <2c754b2c4aab49d89c626af41b84d51f@git.apache.org> References: <2c754b2c4aab49d89c626af41b84d51f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/23] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Mon, 20 Jun 2016 23:49:56 -0000 Merge branch '1.7' into 1.8 Conflicts: server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/24844cc2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24844cc2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/24844cc2 Branch: refs/heads/master Commit: 24844cc2c2409986e9ef0f4d7b7a543b1121cb3a Parents: 519e5b7 976c0aa Author: Christopher Tubbs Authored: Mon Jun 20 19:23:51 2016 -0400 Committer: Christopher Tubbs Committed: Mon Jun 20 19:23:51 2016 -0400 ---------------------------------------------------------------------- pom.xml | 2 +- .../master/balancer/BaseHostRegexTableLoadBalancerTest.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/24844cc2/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/24844cc2/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java ----------------------------------------------------------------------