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 22413DA2A for ; Thu, 11 Oct 2012 17:17:50 +0000 (UTC) Received: (qmail 64066 invoked by uid 500); 11 Oct 2012 17:17:50 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 64035 invoked by uid 500); 11 Oct 2012 17:17: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 64028 invoked by uid 99); 11 Oct 2012 17:17:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Oct 2012 17:17:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Oct 2012 17:17:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B8444238896F for ; Thu, 11 Oct 2012 17:17:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1397177 - in /accumulo/trunk: ./ core/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java server/ server/src/main/java/org/apache/accumulo/server/Accumulo.java src/ Date: Thu, 11 Oct 2012 17:17:03 -0000 To: commits@accumulo.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121011171703.B8444238896F@eris.apache.org> Author: ecn Date: Thu Oct 11 17:17:03 2012 New Revision: 1397177 URL: http://svn.apache.org/viewvc?rev=1397177&view=rev Log: ACCUMULO-800 do not log the instance secret: merge to trunk Modified: accumulo/trunk/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/server/src/main/java/org/apache/accumulo/server/Accumulo.java accumulo/trunk/src/ (props changed) Propchange: accumulo/trunk/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src:r1397176 Merged /accumulo/branches/1.4:r1397176 Propchange: accumulo/trunk/core/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/core:r1397176 Merged /accumulo/branches/1.4/src/core:r1397176 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1397176 Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1397176 Propchange: accumulo/trunk/server/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/server:r1397176 Merged /accumulo/branches/1.4/src/server:r1397176 Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/Accumulo.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/Accumulo.java?rev=1397177&r1=1397176&r2=1397177&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/Accumulo.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/Accumulo.java Thu Oct 11 17:17:03 2012 @@ -128,7 +128,7 @@ public class Accumulo { sortedProps.put(entry.getKey(), entry.getValue()); for (Entry entry : sortedProps.entrySet()) { - if (entry.getKey().toLowerCase().contains("password")) + if (entry.getKey().toLowerCase().contains("password") || entry.getKey().toLowerCase().contains("secret")) log.info(entry.getKey() + " = "); else log.info(entry.getKey() + " = " + entry.getValue()); Propchange: accumulo/trunk/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src:r1397176 Merged /accumulo/branches/1.4/src/src:r1397176