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 810CD200B6B for ; Fri, 9 Sep 2016 20:57:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7FAED160AA3; Fri, 9 Sep 2016 18:57:36 +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 F0F65160ADF for ; Fri, 9 Sep 2016 20:57:34 +0200 (CEST) Received: (qmail 67333 invoked by uid 500); 9 Sep 2016 18:57:34 -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 67027 invoked by uid 99); 9 Sep 2016 18:57: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; Fri, 09 Sep 2016 18:57:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A015BEF7C3; Fri, 9 Sep 2016 18:57:33 +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: Fri, 09 Sep 2016 18:57:41 -0000 Message-Id: <31b2237a8ed14868aa279c6802c5f58c@git.apache.org> In-Reply-To: <1ac73eed54c04a0f9960a258c9f0f5a1@git.apache.org> References: <1ac73eed54c04a0f9960a258c9f0f5a1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/18] accumulo git commit: Merge branch 'pr-149' into 1.6 archived-at: Fri, 09 Sep 2016 18:57:36 -0000 Merge branch 'pr-149' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/726aa1d4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/726aa1d4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/726aa1d4 Branch: refs/heads/1.6 Commit: 726aa1d4c8fed237f2eae8c4cd026683f9a7c500 Parents: 768a73c 0ecc471 Author: Christopher Tubbs Authored: Fri Sep 9 14:47:15 2016 -0400 Committer: Christopher Tubbs Committed: Fri Sep 9 14:47:15 2016 -0400 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/conf/Property.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------