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 8097710579 for ; Fri, 25 Oct 2013 22:52:21 +0000 (UTC) Received: (qmail 47714 invoked by uid 500); 25 Oct 2013 22:52:21 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 47689 invoked by uid 500); 25 Oct 2013 22:52:21 -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 47682 invoked by uid 99); 25 Oct 2013 22:52:21 -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, 25 Oct 2013 22:52:21 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F30DB81E753; Fri, 25 Oct 2013 22:52:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vines@apache.org To: commits@accumulo.apache.org Message-Id: <64ab758524594d90ab8912e2b69b5d80@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: ACCUMULO-1554 - explicitly calling properties toString() method Date: Fri, 25 Oct 2013 22:52:20 +0000 (UTC) Updated Branches: refs/heads/master 0a3de4762 -> 03fd5847a ACCUMULO-1554 - explicitly calling properties toString() method Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/03fd5847 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/03fd5847 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/03fd5847 Branch: refs/heads/master Commit: 03fd5847ab63f963c8367144c21873489a343550 Parents: 0a3de47 Author: John Vines Authored: Fri Oct 25 18:52:02 2013 -0400 Committer: John Vines Committed: Fri Oct 25 18:52:02 2013 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/03fd5847/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java ---------------------------------------------------------------------- diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java index 2ae6d0f..39cd6d4 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java @@ -109,7 +109,7 @@ public class MiniAccumuloConfig { mergeProp(Property.TSERV_MAXMEM.getKey(), "50M"); mergeProp(Property.TSERV_WALOG_MAX_SIZE.getKey(), "100M"); mergeProp(Property.TSERV_NATIVEMAP_ENABLED.getKey(), "false"); - mergeProp(Property.TRACE_TOKEN_PROPERTY_PREFIX + ".password", getRootPassword()); + mergeProp(Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey() + ".password", getRootPassword()); // since there is a small amount of memory, check more frequently for majc... setting may not be needed in 1.5 mergeProp(Property.TSERV_MAJC_DELAY.getKey(), "3"); mergeProp(Property.GENERAL_CLASSPATHS.getKey(), classpath);