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 6A5E0200B53 for ; Tue, 21 Jun 2016 05:39:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 695CD160A69; Tue, 21 Jun 2016 03:39:57 +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 D0DE4160A55 for ; Tue, 21 Jun 2016 05:39:56 +0200 (CEST) Received: (qmail 13107 invoked by uid 500); 21 Jun 2016 03:39:56 -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 11963 invoked by uid 99); 21 Jun 2016 03:39:51 -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; Tue, 21 Jun 2016 03:39:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 753C9ED31E; Tue, 21 Jun 2016 03:39:51 +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: Tue, 21 Jun 2016 03:40:14 -0000 Message-Id: <435606bec01b45c9b914d9a699635bf5@git.apache.org> In-Reply-To: <1e6de167d71b4f33881452e96aeca8ff@git.apache.org> References: <1e6de167d71b4f33881452e96aeca8ff@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [24/28] accumulo git commit: Merge remote-tracking branch 'origin/1.8' into 1.8 archived-at: Tue, 21 Jun 2016 03:39:57 -0000 Merge remote-tracking branch 'origin/1.8' 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/af802612 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/af802612 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/af802612 Branch: refs/heads/1.8 Commit: af802612965e903a7bfa034bc2afaa02e21ad735 Parents: a24a286 94bf129 Author: Josh Elser Authored: Mon Jun 20 23:33:11 2016 -0400 Committer: Josh Elser Committed: Mon Jun 20 23:33:11 2016 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/conf/PropertyType.java | 3 - .../core/metadata/MetadataLocationObtainer.java | 21 ++++--- .../core/client/impl/ScannerOptionsTest.java | 58 +++++++++++--------- pom.xml | 2 +- .../accumulo/server/rpc/TServerUtils.java | 4 +- .../BaseHostRegexTableLoadBalancerTest.java | 7 ++- .../accumulo/server/util/TServerUtilsTest.java | 5 ++ 7 files changed, 58 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/af802612/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java ----------------------------------------------------------------------