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 567A3200C09 for ; Wed, 25 Jan 2017 22:44:34 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 55032160B5D; Wed, 25 Jan 2017 21:44:34 +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 C4E9F160B4E for ; Wed, 25 Jan 2017 22:44:33 +0100 (CET) Received: (qmail 23472 invoked by uid 500); 25 Jan 2017 21:44:33 -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 23446 invoked by uid 99); 25 Jan 2017 21:44:33 -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, 25 Jan 2017 21:44:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DB110DFDC6; Wed, 25 Jan 2017 21:44:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dlmarion@apache.org To: commits@accumulo.apache.org Date: Wed, 25 Jan 2017 21:44:33 -0000 Message-Id: <7026e96383d24f81beaea2023723ac2c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Wed, 25 Jan 2017 21:44:34 -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/8668c7f3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8668c7f3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8668c7f3 Branch: refs/heads/master Commit: 8668c7f381832128d6bf76e8b6097778a42b71c4 Parents: b903766 ff134d2 Author: Dave Marion Authored: Wed Jan 25 16:11:20 2017 -0500 Committer: Dave Marion Committed: Wed Jan 25 16:11:20 2017 -0500 ---------------------------------------------------------------------- .../balancer/HostRegexTableLoadBalancer.java | 86 ++++++++++---------- .../BaseHostRegexTableLoadBalancerTest.java | 14 +++- ...gexTableLoadBalancerReconfigurationTest.java | 5 +- .../HostRegexTableLoadBalancerTest.java | 7 +- 4 files changed, 60 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8668c7f3/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8668c7f3/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java ----------------------------------------------------------------------