From commits-return-23013-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Fri Jun 14 04:46:06 2019 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 [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 9B18818067E for ; Fri, 14 Jun 2019 06:46:06 +0200 (CEST) Received: (qmail 50310 invoked by uid 500); 14 Jun 2019 04:46:06 -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 50280 invoked by uid 99); 14 Jun 2019 04:46:05 -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; Fri, 14 Jun 2019 04:46:05 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 9676A87AD7; Fri, 14 Jun 2019 04:46:05 +0000 (UTC) Date: Fri, 14 Jun 2019 04:46:05 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] branch 2.0 updated: Fix tests broken due to #1202 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <156048756549.19327.15710078721820203384@gitbox.apache.org> From: ctubbsii@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/2.0 X-Git-Reftype: branch X-Git-Oldrev: 87639a355251e98c107ef072639bccc6de9cffc4 X-Git-Newrev: 190842aaa92c1fdeb98e11a0756644457ea73fa3 X-Git-Rev: 190842aaa92c1fdeb98e11a0756644457ea73fa3 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.0 in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/2.0 by this push: new 190842a Fix tests broken due to #1202 190842a is described below commit 190842aaa92c1fdeb98e11a0756644457ea73fa3 Author: Christopher Tubbs AuthorDate: Fri Jun 14 00:44:54 2019 -0400 Fix tests broken due to #1202 --- core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java index 6ce1120..64b19c8 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java @@ -102,8 +102,10 @@ public enum PropertyType { + "Substitutions of the ACCUMULO_HOME environment variable can be done in the system " + "config file using '${env:ACCUMULO_HOME}' or similar."), + // VFS_CLASSLOADER_CACHE_DIR's default value is a special case, for documentation purposes ABSOLUTEPATH("absolute path", - x -> x == null || x.trim().isEmpty() || new Path(x.trim()).isAbsolute(), + x -> x == null || x.trim().isEmpty() || new Path(x.trim()).isAbsolute() + || x.equals(Property.VFS_CLASSLOADER_CACHE_DIR.getDefaultValue()), "An absolute filesystem path. The filesystem depends on the property." + " This is the same as path, but enforces that its root is explicitly" + " specified."),