Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 791321180A for ; Fri, 22 Aug 2014 22:06:31 +0000 (UTC) Received: (qmail 22590 invoked by uid 500); 22 Aug 2014 22:06:31 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 22558 invoked by uid 500); 22 Aug 2014 22:06:31 -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 22323 invoked by uid 99); 22 Aug 2014 22:06:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Aug 2014 22:06:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 06C8C9C8CF4; Fri, 22 Aug 2014 22:06:31 +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, 22 Aug 2014 22:06:33 -0000 Message-Id: In-Reply-To: <9389dc07fe784ff8a82dadb8d43d8734@git.apache.org> References: <9389dc07fe784ff8a82dadb8d43d8734@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/45d61cb3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/45d61cb3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/45d61cb3 Branch: refs/heads/1.6.1-SNAPSHOT Commit: 45d61cb3cf282bfdfd66724684bd1c73c7444c1e Parents: 3f4e7b4 345332b Author: Christopher Tubbs Authored: Fri Aug 22 17:51:36 2014 -0400 Committer: Christopher Tubbs Committed: Fri Aug 22 17:51:36 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/45d61cb3/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java ----------------------------------------------------------------------