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 1A5DA200C6C for ; Tue, 28 Mar 2017 01:49:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 191D4160B85; Mon, 27 Mar 2017 23:49:52 +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 50FDC160B9E for ; Tue, 28 Mar 2017 01:49:51 +0200 (CEST) Received: (qmail 44318 invoked by uid 500); 27 Mar 2017 23:49:50 -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 44229 invoked by uid 99); 27 Mar 2017 23:49:50 -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, 27 Mar 2017 23:49:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 466CEDFFD7; Mon, 27 Mar 2017 23:49:50 +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, 27 Mar 2017 23:49:53 -0000 Message-Id: <6153bb3612f7400a87833821b9f82703@git.apache.org> In-Reply-To: <316bd77ca8d6470d96064c75e2ce4447@git.apache.org> References: <316bd77ca8d6470d96064c75e2ce4447@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Mon, 27 Mar 2017 23:49:52 -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/8d6b7299 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8d6b7299 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8d6b7299 Branch: refs/heads/master Commit: 8d6b7299e4b3ee9b593f1b75d78164088c7402ae Parents: 7f865d2 4ba5faf Author: Christopher Tubbs Authored: Mon Mar 27 19:47:46 2017 -0400 Committer: Christopher Tubbs Committed: Mon Mar 27 19:47:46 2017 -0400 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/conf/Property.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d6b7299/core/src/main/java/org/apache/accumulo/core/conf/Property.java ----------------------------------------------------------------------