accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1336687 - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java server/ src/
Date Thu, 10 May 2012 13:47:00 GMT
Author: vines
Date: Thu May 10 13:47:00 2012
New Revision: 1336687

URL: http://svn.apache.org/viewvc?rev=1336687&view=rev
Log:
ACCUMULO-480 - merging oops

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1336642-1336686
  Merged /accumulo/branches/1.4:r1336642-1336686

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/core:r1336642-1336686
  Merged /accumulo/branches/1.4/src/core:r1336642-1336686

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java?rev=1336687&r1=1336686&r2=1336687&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
Thu May 10 13:47:00 2012
@@ -102,7 +102,7 @@ public class DefaultConfiguration extend
           if (Property.isValidZooPropertyKey(prop.getKey())) {
             zoo = "yes";
             if (Property.isFixedZooPropertyKey(prop)) {
-              zoo = "yes but requires restart of the " + prop.getKey().split(".")[0];
+              zoo = "yes but requires restart of the " + prop.getKey().split("[.]")[0];
             }
           }
           doc.println("    <td>" + zoo + "</td>");

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/server:r1336642-1336686
  Merged /accumulo/branches/1.4/src/server:r1336642-1336686

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1336642-1336686
  Merged /accumulo/branches/1.4/src/src:r1336642-1336686



Mime
View raw message