You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2012/10/11 19:17:03 UTC
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/
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<String,String> entry : sortedProps.entrySet()) {
- if (entry.getKey().toLowerCase().contains("password"))
+ if (entry.getKey().toLowerCase().contains("password") || entry.getKey().toLowerCase().contains("secret"))
log.info(entry.getKey() + " = <hidden>");
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