accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1383499 [1/2] - in /accumulo/branches/ACCUMULO-722/1.5: ./ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/ conf/examples/3GB/native-standalone/ conf/exam...
Date Tue, 11 Sep 2012 18:00:20 GMT
Author: ecn
Date: Tue Sep 11 18:00:17 2012
New Revision: 1383499

URL: http://svn.apache.org/viewvc?rev=1383499&view=rev
Log:
ACCUMULO-722: merge from trunk

Modified:
    accumulo/branches/ACCUMULO-722/1.5/   (props changed)
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/native-standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/native-standalone/log4j.properties
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/native-standalone/monitor_logger.xml
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/standalone/log4j.properties
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/standalone/monitor_logger.xml
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/native-standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/native-standalone/log4j.properties
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/native-standalone/monitor_logger.xml
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/standalone/log4j.properties
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/standalone/monitor_logger.xml
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/native-standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/native-standalone/log4j.properties
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/native-standalone/monitor_logger.xml
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/standalone/log4j.properties
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/standalone/monitor_logger.xml
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/native-standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/native-standalone/log4j.properties
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/native-standalone/monitor_logger.xml
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/standalone/generic_logger.xml
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/standalone/log4j.properties
    accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/standalone/monitor_logger.xml
    accumulo/branches/ACCUMULO-722/1.5/core/   (props changed)
    accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/client/admin/FindMax.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockScanner.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFileDumper.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/format/DeleterFormatter.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
    accumulo/branches/ACCUMULO-722/1.5/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java
    accumulo/branches/ACCUMULO-722/1.5/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
    accumulo/branches/ACCUMULO-722/1.5/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java
    accumulo/branches/ACCUMULO-722/1.5/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
    accumulo/branches/ACCUMULO-722/1.5/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
    accumulo/branches/ACCUMULO-722/1.5/server/   (props changed)
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTrace.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/EstimateInMemMapOverhead.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/NativeMapConcurrencyTest.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/NullBatchWriter.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/MaxOpenTest.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/BatchVerify.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/scalability/ScaleTest.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java
    accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
    accumulo/branches/ACCUMULO-722/1.5/src/   (props changed)

Propchange: accumulo/branches/ACCUMULO-722/1.5/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1359721
  Merged /accumulo/branches/1.4/src:r1382566,1382923
  Merged /accumulo/trunk:r1382042-1383490
  Merged /accumulo/branches/1.4:r1356924-1358205,1358207-1382577,1382613

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/native-standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/native-standalone/generic_logger.xml?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/native-standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/native-standalone/generic_logger.xml Tue Sep 11 18:00:17 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/native-standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/native-standalone/log4j.properties?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/native-standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/native-standalone/log4j.properties Tue Sep 11 18:00:17 2012
@@ -35,5 +35,5 @@ log4j.logger.org.apache.accumulo.core.ut
 
 # Send most things to the console
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout.ConversionPattern=%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/native-standalone/monitor_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/native-standalone/monitor_logger.xml?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/native-standalone/monitor_logger.xml (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/native-standalone/monitor_logger.xml Tue Sep 11 18:00:17 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/standalone/generic_logger.xml?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/standalone/generic_logger.xml Tue Sep 11 18:00:17 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/standalone/log4j.properties?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/standalone/log4j.properties Tue Sep 11 18:00:17 2012
@@ -35,5 +35,5 @@ log4j.logger.org.apache.accumulo.core.ut
 
 # Send most things to the console
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout.ConversionPattern=%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/standalone/monitor_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/standalone/monitor_logger.xml?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/standalone/monitor_logger.xml (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/1GB/standalone/monitor_logger.xml Tue Sep 11 18:00:17 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/native-standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/native-standalone/generic_logger.xml?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/native-standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/native-standalone/generic_logger.xml Tue Sep 11 18:00:17 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/native-standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/native-standalone/log4j.properties?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/native-standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/native-standalone/log4j.properties Tue Sep 11 18:00:17 2012
@@ -35,5 +35,5 @@ log4j.logger.org.apache.accumulo.core.ut
 
 # Send most things to the console
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout.ConversionPattern=%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/native-standalone/monitor_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/native-standalone/monitor_logger.xml?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/native-standalone/monitor_logger.xml (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/native-standalone/monitor_logger.xml Tue Sep 11 18:00:17 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/standalone/generic_logger.xml?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/standalone/generic_logger.xml Tue Sep 11 18:00:17 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/standalone/log4j.properties?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/standalone/log4j.properties Tue Sep 11 18:00:17 2012
@@ -35,5 +35,5 @@ log4j.logger.org.apache.accumulo.core.ut
 
 # Send most things to the console
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout.ConversionPattern=%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/standalone/monitor_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/standalone/monitor_logger.xml?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/standalone/monitor_logger.xml (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/2GB/standalone/monitor_logger.xml Tue Sep 11 18:00:17 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/native-standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/native-standalone/generic_logger.xml?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/native-standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/native-standalone/generic_logger.xml Tue Sep 11 18:00:17 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/native-standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/native-standalone/log4j.properties?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/native-standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/native-standalone/log4j.properties Tue Sep 11 18:00:17 2012
@@ -35,5 +35,5 @@ log4j.logger.org.apache.accumulo.core.ut
 
 # Send most things to the console
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout.ConversionPattern=%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/native-standalone/monitor_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/native-standalone/monitor_logger.xml?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/native-standalone/monitor_logger.xml (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/native-standalone/monitor_logger.xml Tue Sep 11 18:00:17 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/standalone/generic_logger.xml?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/standalone/generic_logger.xml Tue Sep 11 18:00:17 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/standalone/log4j.properties?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/standalone/log4j.properties Tue Sep 11 18:00:17 2012
@@ -35,5 +35,5 @@ log4j.logger.org.apache.accumulo.core.ut
 
 # Send most things to the console
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout.ConversionPattern=%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/standalone/monitor_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/standalone/monitor_logger.xml?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/standalone/monitor_logger.xml (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/3GB/standalone/monitor_logger.xml Tue Sep 11 18:00:17 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/native-standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/native-standalone/generic_logger.xml?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/native-standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/native-standalone/generic_logger.xml Tue Sep 11 18:00:17 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/native-standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/native-standalone/log4j.properties?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/native-standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/native-standalone/log4j.properties Tue Sep 11 18:00:17 2012
@@ -35,5 +35,5 @@ log4j.logger.org.apache.accumulo.core.ut
 
 # Send most things to the console
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout.ConversionPattern=%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/native-standalone/monitor_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/native-standalone/monitor_logger.xml?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/native-standalone/monitor_logger.xml (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/native-standalone/monitor_logger.xml Tue Sep 11 18:00:17 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/standalone/generic_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/standalone/generic_logger.xml?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/standalone/generic_logger.xml (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/standalone/generic_logger.xml Tue Sep 11 18:00:17 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %m%n"/>
      </layout>	    
   </appender>
 

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/standalone/log4j.properties?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/standalone/log4j.properties Tue Sep 11 18:00:17 2012
@@ -35,5 +35,5 @@ log4j.logger.org.apache.accumulo.core.ut
 
 # Send most things to the console
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout.ConversionPattern=%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %m%n
+log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout

Modified: accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/standalone/monitor_logger.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/standalone/monitor_logger.xml?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/standalone/monitor_logger.xml (original)
+++ accumulo/branches/ACCUMULO-722/1.5/conf/examples/512MB/standalone/monitor_logger.xml Tue Sep 11 18:00:17 2012
@@ -25,7 +25,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="DEBUG"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 
@@ -36,7 +36,7 @@
      <param name="MaxBackupIndex" value="10"/>
      <param name="Threshold"      value="INFO"/>
      <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d{dd HH:mm:ss,SSS} [%-8c{2}] %-5p: %X{application} %m%n"/>
+       <param name="ConversionPattern" value="%d{ISO8601} [%-8c{2}] %-5p: %X{application} %m%n"/>
      </layout>	    
   </appender>
 

Propchange: accumulo/branches/ACCUMULO-722/1.5/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/core:r1382042-1383490
  Merged /accumulo/branches/1.4/core:r1356924-1358205,1358207-1382577,1382613
  Merged /accumulo/branches/1.4/src/core:r1382566,1382923

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/client/admin/FindMax.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/client/admin/FindMax.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/client/admin/FindMax.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/client/admin/FindMax.java Tue Sep 11 18:00:17 2012
@@ -89,7 +89,7 @@ public class FindMax {
   
   private static Text _findMax(Scanner scanner, Text start, boolean inclStart, Text end, boolean inclEnd) {
     
-    // System.out.printf("findMax(%s, %s, %s, %s)\n", Key.toPrintableString(start.getBytes(), 0, start.getLength(), 1000), inclStart,
+    // System.out.printf("findMax(%s, %s, %s, %s)%n", Key.toPrintableString(start.getBytes(), 0, start.getLength(), 1000), inclStart,
     // Key.toPrintableString(end.getBytes(), 0, end.getLength(), 1000), inclEnd);
     
     int cmp = start.compareTo(end);

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java Tue Sep 11 18:00:17 2012
@@ -72,7 +72,6 @@ import org.apache.thrift.TServiceClient;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
 
-
 /*
  * Differences from previous TabletServerBatchWriter
  *   + As background threads finish sending mutations to tablet servers they decrement memory usage
@@ -242,7 +241,7 @@ public class TabletServerBatchWriter {
     }
   }
   
-  public synchronized void addMutation(String table, Iterator<Mutation> iterator) throws MutationsRejectedException {
+  public void addMutation(String table, Iterator<Mutation> iterator) throws MutationsRejectedException {
     while (iterator.hasNext()) {
       addMutation(table, iterator.next());
     }

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockScanner.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockScanner.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockScanner.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockScanner.java Tue Sep 11 18:00:17 2012
@@ -31,12 +31,12 @@ import org.apache.accumulo.core.security
 
 public class MockScanner extends MockScannerBase implements Scanner {
   
-  int timeOut = 0;
   int batchSize = 0;
   Range range = new Range();
   
   MockScanner(MockTable table, Authorizations auths) {
     super(table, auths);
+    timeOut = 0;
   }
   
   @Override

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java Tue Sep 11 18:00:17 2012
@@ -30,7 +30,7 @@ public class DefaultConfiguration extend
   private static DefaultConfiguration instance = null;
   private static Logger log = Logger.getLogger(DefaultConfiguration.class);
   
-  public static DefaultConfiguration getInstance() {
+  synchronized public static DefaultConfiguration getInstance() {
     if (instance == null) {
       instance = new DefaultConfiguration();
       ConfigSanityCheck.validate(instance);

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java Tue Sep 11 18:00:17 2012
@@ -35,7 +35,7 @@ public class SiteConfiguration extends A
     SiteConfiguration.parent = parent;
   }
   
-  public static SiteConfiguration getInstance(AccumuloConfiguration parent) {
+  synchronized public static SiteConfiguration getInstance(AccumuloConfiguration parent) {
     if (instance == null) {
       instance = new SiteConfiguration(parent);
       ConfigSanityCheck.validate(instance);
@@ -43,7 +43,7 @@ public class SiteConfiguration extends A
     return instance;
   }
   
-  private static Configuration getXmlConfig() {
+  synchronized private static Configuration getXmlConfig() {
     String configFile = System.getProperty("org.apache.accumulo.config.file", "accumulo-site.xml");
     if (xmlConfig == null) {
       xmlConfig = new Configuration(false);

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java Tue Sep 11 18:00:17 2012
@@ -440,7 +440,7 @@ public class BloomFilterLayer {
     
     long t2 = System.currentTimeMillis();
     
-    out.printf("write rate %6.2f\n", vals.size() / ((t2 - t1) / 1000.0));
+    out.printf("write rate %6.2f%n", vals.size() / ((t2 - t1) / 1000.0));
     
     bmfw.close();
     
@@ -468,7 +468,7 @@ public class BloomFilterLayer {
     
     t2 = System.currentTimeMillis();
     
-    out.printf("random lookup rate : %6.2f\n", 5000 / ((t2 - t1) / 1000.0));
+    out.printf("random lookup rate : %6.2f%n", 5000 / ((t2 - t1) / 1000.0));
     out.println("hits = " + hits);
     
     int count = 0;
@@ -495,7 +495,7 @@ public class BloomFilterLayer {
     
     t2 = System.currentTimeMillis();
     
-    out.printf("existant lookup rate %6.2f\n", 500 / ((t2 - t1) / 1000.0));
+    out.printf("existant lookup rate %6.2f%n", 500 / ((t2 - t1) / 1000.0));
     out.println("expected hits 500.  Receive hits: " + count);
     bmfr.close();
   }

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java Tue Sep 11 18:00:17 2012
@@ -338,7 +338,7 @@ public class FileUtil {
       
       long t2 = System.currentTimeMillis();
       
-      log.debug(String.format("Found midPoint from indexes in %6.2f secs.\n", ((t2 - t1) / 1000.0)));
+      log.debug(String.format("Found midPoint from indexes in %6.2f secs.%n", ((t2 - t1) / 1000.0)));
       
       ret.put(.5, mmfi.getTopKey());
       

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java Tue Sep 11 18:00:17 2012
@@ -74,7 +74,7 @@ public class RelativeKey implements Writ
     dos.close();
     
     System.out.println("Compressed column map size : " + baos.toByteArray().length);
-    System.out.printf("Bytes written : %,d\n", bytesWritten);
+    System.out.printf("Bytes written : %,d%n", bytesWritten);
     
   }
   
@@ -421,7 +421,7 @@ public class RelativeKey implements Writ
     
     out.writeByte(fieldsSame);
     
-    // System.out.printf("wrote fs %x\n", fieldsSame);
+    // System.out.printf("wrote fs %x%n", fieldsSame);
     
     bytesWritten += 1;
     

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java Tue Sep 11 18:00:17 2012
@@ -2012,7 +2012,7 @@ public class TFile {
    *          A list of TFile paths.
    */
   public static void main(String[] args) {
-    System.out.printf("TFile Dumper (TFile %s, BCFile %s)\n", TFile.API_VERSION.toString(), BCFile.API_VERSION.toString());
+    System.out.printf("TFile Dumper (TFile %s, BCFile %s)%n", TFile.API_VERSION.toString(), BCFile.API_VERSION.toString());
     if (args.length == 0) {
       System.out.println("Usage: java ... org.apache.hadoop.io.file.tfile.TFile tfile-path [tfile-path ...]");
       System.exit(0);

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFileDumper.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFileDumper.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFileDumper.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFileDumper.java Tue Sep 11 18:00:17 2012
@@ -163,7 +163,7 @@ class TFileDumper {
       }
       for (Iterator<Map.Entry<String,String>> it = entrySet.iterator(); it.hasNext();) {
         Map.Entry<String,String> e = it.next();
-        out.printf("%s : %s\n", Align.format(e.getKey(), maxKeyLength, Align.LEFT), e.getValue());
+        out.printf("%s : %s%n", Align.format(e.getKey(), maxKeyLength, Align.LEFT), e.getValue());
       }
       out.println();
       reader.checkTFileDataIndex();
@@ -182,7 +182,7 @@ class TFileDumper {
         String endKey = "End-Key";
         int endKeyWidth = Math.max(endKey.length(), maxKeySampleLen * 2 + 5);
         
-        out.printf("%s %s %s %s %s %s\n", Align.format(blkID, blkIDWidth, Align.CENTER), Align.format(offset, offsetWidth, Align.CENTER),
+        out.printf("%s %s %s %s %s %s%n", Align.format(blkID, blkIDWidth, Align.CENTER), Align.format(offset, offsetWidth, Align.CENTER),
             Align.format(blkLen, blkLenWidth, Align.CENTER), Align.format(rawSize, rawSizeWidth, Align.CENTER),
             Align.format(records, recordsWidth, Align.CENTER), Align.format(endKey, endKeyWidth, Align.LEFT));
         
@@ -237,7 +237,7 @@ class TFileDumper {
         int rawSizeWidth = Align.calculateWidth(rawSize, metaSizeUncompressed / metaBlkCnt * 10);
         String compression = "Compression";
         int compressionWidth = compression.length();
-        out.printf("%s %s %s %s %s\n", Align.format(name, nameWidth, Align.CENTER), Align.format(offset, offsetWidth, Align.CENTER),
+        out.printf("%s %s %s %s %s%n", Align.format(name, nameWidth, Align.CENTER), Align.format(offset, offsetWidth, Align.CENTER),
             Align.format(blkLen, blkLenWidth, Align.CENTER), Align.format(rawSize, rawSizeWidth, Align.CENTER),
             Align.format(compression, compressionWidth, Align.LEFT));
         
@@ -246,7 +246,7 @@ class TFileDumper {
           String blkName = e.getValue().getMetaName();
           BlockRegion region = e.getValue().getRegion();
           String blkCompression = e.getValue().getCompressionAlgorithm().getName();
-          out.printf("%s %s %s %s %s\n", Align.format(blkName, nameWidth, Align.LEFT), Align.format(region.getOffset(), offsetWidth, Align.LEFT),
+          out.printf("%s %s %s %s %s%n", Align.format(blkName, nameWidth, Align.LEFT), Align.format(region.getOffset(), offsetWidth, Align.LEFT),
               Align.format(region.getCompressedSize(), blkLenWidth, Align.LEFT), Align.format(region.getRawSize(), rawSizeWidth, Align.LEFT),
               Align.format(blkCompression, compressionWidth, Align.LEFT));
         }

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java Tue Sep 11 18:00:17 2012
@@ -81,19 +81,19 @@ public class TraceFormatter implements F
       SimpleDateFormat dateFormatter = new SimpleDateFormat(DATE_FORMAT);
       RemoteSpan span = getRemoteSpan(next);
       result.append("----------------------\n");
-      result.append(String.format(" %12s:%s\n", "name", span.description));
-      result.append(String.format(" %12s:%s\n", "trace", Long.toHexString(span.traceId)));
-      result.append(String.format(" %12s:%s\n", "loc", span.svc + "@" + span.sender));
-      result.append(String.format(" %12s:%s\n", "span", Long.toHexString(span.spanId)));
-      result.append(String.format(" %12s:%s\n", "parent", Long.toHexString(span.parentId)));
-      result.append(String.format(" %12s:%s\n", "start", dateFormatter.format(span.start)));
-      result.append(String.format(" %12s:%s\n", "ms", span.stop - span.start));
+      result.append(String.format(" %12s:%s%n", "name", span.description));
+      result.append(String.format(" %12s:%s%n", "trace", Long.toHexString(span.traceId)));
+      result.append(String.format(" %12s:%s%n", "loc", span.svc + "@" + span.sender));
+      result.append(String.format(" %12s:%s%n", "span", Long.toHexString(span.spanId)));
+      result.append(String.format(" %12s:%s%n", "parent", Long.toHexString(span.parentId)));
+      result.append(String.format(" %12s:%s%n", "start", dateFormatter.format(span.start)));
+      result.append(String.format(" %12s:%s%n", "ms", span.stop - span.start));
       for (Entry<String,String> entry : span.data.entrySet()) {
-        result.append(String.format(" %12s:%s\n", entry.getKey(), entry.getValue()));
+        result.append(String.format(" %12s:%s%n", entry.getKey(), entry.getValue()));
       }
       
       if (printTimeStamps) {
-        result.append(String.format(" %-12s:%d\n", "timestamp", next.getKey().getTimestamp()));
+        result.append(String.format(" %-12s:%d%n", "timestamp", next.getKey().getTimestamp()));
       }
       return result.toString();
     }

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java Tue Sep 11 18:00:17 2012
@@ -75,7 +75,7 @@ public class StopWatch<K extends Enum<K>
   
   public synchronized void print() {
     for (K timer : totalTime.keySet()) {
-      System.out.printf("%20s : %,6.4f secs\n", timer.toString(), get(timer) / 1000.0);
+      System.out.printf("%20s : %,6.4f secs%n", timer.toString(), get(timer) / 1000.0);
     }
   }
   

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java Tue Sep 11 18:00:17 2012
@@ -204,7 +204,7 @@ public class TableDiskUsage {
     }
     
     for (Entry<TreeSet<String>,Long> entry : usage.entrySet())
-      System.out.printf("%,24d %s\n", entry.getValue(), entry.getKey());
+      System.out.printf("%,24d %s%n", entry.getValue(), entry.getKey());
     
   }
   

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/format/DeleterFormatter.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/format/DeleterFormatter.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/format/DeleterFormatter.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/format/DeleterFormatter.java Tue Sep 11 18:00:17 2012
@@ -88,7 +88,7 @@ public class DeleterFormatter extends De
               log.trace(cvs.toString());
         }
       }
-      shellState.getReader().printString(String.format("[%s] %s\n", delete ? "DELETED" : "SKIPPED", entryStr));
+      shellState.getReader().printString(String.format("[%s] %s%n", delete ? "DELETED" : "SKIPPED", entryStr));
     } catch (IOException e) {
       log.error("Cannot write to console", e);
       throw new RuntimeException(e);

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Tue Sep 11 18:00:17 2012
@@ -440,7 +440,7 @@ public class Shell extends ShellOptions 
     if (disableAuthTimeout)
       sb.append("- Authorization timeout: disabled\n");
     else
-      sb.append("- Authorization timeout: ").append(String.format("%.2fs\n", authTimeout / 1000.0));
+      sb.append("- Authorization timeout: ").append(String.format("%.2fs%n", authTimeout / 1000.0));
     sb.append("- Debug: ").append(isDebuggingEnabled() ? "on" : "off").append("\n");
     if (!scanIteratorOptions.isEmpty()) {
       for (Entry<String,List<IteratorSetting>> entry : scanIteratorOptions.entrySet()) {
@@ -844,12 +844,12 @@ public class Shell extends ShellOptions 
     printException(cve, "");
     int COL1 = 50, COL2 = 14;
     int col3 = Math.max(1, Math.min(Integer.MAX_VALUE, reader.getTermwidth() - COL1 - COL2 - 6));
-    logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s\n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
-    logError(String.format("%-" + COL1 + "s | %" + COL2 + "s | %-" + col3 + "s\n", "Constraint class", "Violation code", "Violation Description"));
-    logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s\n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
+    logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s%n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
+    logError(String.format("%-" + COL1 + "s | %" + COL2 + "s | %-" + col3 + "s%n", "Constraint class", "Violation code", "Violation Description"));
+    logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s%n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
     for (TConstraintViolationSummary cvs : cve.violationSummaries)
-      logError(String.format("%-" + COL1 + "s | %" + COL2 + "d | %-" + col3 + "s\n", cvs.constrainClass, cvs.violationCode, cvs.violationDescription));
-    logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s\n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
+      logError(String.format("%-" + COL1 + "s | %" + COL2 + "d | %-" + col3 + "s%n", cvs.constrainClass, cvs.violationCode, cvs.violationDescription));
+    logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s%n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
   }
   
   public final void printException(Exception e) {

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java Tue Sep 11 18:00:17 2012
@@ -35,7 +35,7 @@ public class TablesCommand extends Comma
     if (cl.hasOption(tableIdOption.getOpt())) {
       Map<String,String> tableIds = shellState.getConnector().tableOperations().tableIdMap();
       for (String tableName : shellState.getConnector().tableOperations().list())
-        shellState.getReader().printString(String.format("%-15s => %10s\n", tableName, tableIds.get(tableName)));
+        shellState.getReader().printString(String.format("%-15s => %10s%n", tableName, tableIds.get(tableName)));
     } else {
       for (String table : shellState.getConnector().tableOperations().list())
         shellState.getReader().printString(table + "\n");

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java Tue Sep 11 18:00:17 2012
@@ -291,7 +291,9 @@ public class AccumuloInputFormatTest {
     AccumuloInputFormat.setInputInfo(job.getConfiguration(), "root", "".getBytes(), "testtable2", new Authorizations());
     AccumuloInputFormat.setMockInstance(job.getConfiguration(), "testmapinstance");
     AccumuloInputFormat input = new AccumuloInputFormat();
-    RangeInputSplit ris = new RangeInputSplit();
+    List<InputSplit> splits = input.getSplits(job);
+    assertEquals(splits.size(), 1);
+    RangeInputSplit ris = (RangeInputSplit) splits.get(0);
     TaskAttemptContext tac = ContextFactory.createTaskAttemptContext(job);
     RecordReader<Key,Value> rr = input.createRecordReader(ris, tac);
     rr.initialize(ris, tac);

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java Tue Sep 11 18:00:17 2012
@@ -20,13 +20,19 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
 
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MutationsRejectedException;
+import org.apache.accumulo.core.client.TableExistsException;
+import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.mapreduce.InputFormatBase.RangeInputSplit;
 import org.apache.accumulo.core.client.mock.MockInstance;
 import org.apache.accumulo.core.data.Key;
@@ -44,78 +50,87 @@ import org.apache.hadoop.mapreduce.TaskA
 import org.junit.Test;
 
 public class AccumuloRowInputFormatTest {
-  List<Entry<Key,Value>> row1;
-  List<Entry<Key,Value>> row2;
-  List<Entry<Key,Value>> row3;
+  private static final String ROW1 = "row1";
+  private static final String ROW2 = "row2";
+  private static final String ROW3 = "row3";
+  private static final String COLF1 = "colf1";
+  private transient final List<Entry<Key,Value>> row1;
+  private transient final List<Entry<Key,Value>> row2;
+  private transient final List<Entry<Key,Value>> row3;
   
-  {
+  public AccumuloRowInputFormatTest() {
     row1 = new ArrayList<Entry<Key,Value>>();
-    row1.add(new KeyValue(new Key("row1", "colf1", "colq1"), "v1".getBytes()));
-    row1.add(new KeyValue(new Key("row1", "colf1", "colq2"), "v2".getBytes()));
-    row1.add(new KeyValue(new Key("row1", "colf2", "colq3"), "v3".getBytes()));
+    row1.add(new KeyValue(new Key(ROW1, COLF1, "colq1"), "v1".getBytes()));
+    row1.add(new KeyValue(new Key(ROW1, COLF1, "colq2"), "v2".getBytes()));
+    row1.add(new KeyValue(new Key(ROW1, "colf2", "colq3"), "v3".getBytes()));
     row2 = new ArrayList<Entry<Key,Value>>();
-    row2.add(new KeyValue(new Key("row2", "colf1", "colq4"), "v4".getBytes()));
+    row2.add(new KeyValue(new Key(ROW2, COLF1, "colq4"), "v4".getBytes()));
     row3 = new ArrayList<Entry<Key,Value>>();
-    row3.add(new KeyValue(new Key("row3", "colf1", "colq5"), "v5".getBytes()));
+    row3.add(new KeyValue(new Key(ROW3, COLF1, "colq5"), "v5".getBytes()));
   }
-  
-  public static void checkLists(List<Entry<Key,Value>> a, List<Entry<Key,Value>> b) {
-    assertEquals(a.size(), b.size());
-    for (int i = 0; i < a.size(); i++) {
-      assertEquals(a.get(i).getKey(), b.get(i).getKey());
-      assertEquals(a.get(i).getValue(), b.get(i).getValue());
+
+  public static void checkLists(final List<Entry<Key,Value>> first, final List<Entry<Key,Value>> second) {
+    assertEquals("Sizes should be the same.", first.size(), second.size());
+    for (int i = 0; i < first.size(); i++) {
+      assertEquals("Keys should be equal.", first.get(i).getKey(), second.get(i).getKey());
+      assertEquals("Values should be equal.", first.get(i).getValue(), second.get(i).getValue());
     }
   }
   
-  public static void checkLists(List<Entry<Key,Value>> a, Iterator<Entry<Key,Value>> b) {
-    int i = 0;
-    while (b.hasNext()) {
-      Entry<Key,Value> e = b.next();
-      assertEquals(a.get(i).getKey(), e.getKey());
-      assertEquals(a.get(i).getValue(), e.getValue());
-      i++;
+  public static void checkLists(final List<Entry<Key,Value>> first, final Iterator<Entry<Key,Value>> second) {
+    int entryIndex = 0; // NOPMD
+    while (second.hasNext()) {
+      final Entry<Key,Value> entry = second.next();
+      assertEquals("Keys should be equal", first.get(entryIndex).getKey(), entry.getKey());
+      assertEquals("Values should be equal", first.get(entryIndex).getValue(), entry.getValue());
+      entryIndex++; // NOPMD
     }
   }
   
-  public static void insertList(BatchWriter bw, List<Entry<Key,Value>> list) throws Exception {
+  public static void insertList(final BatchWriter writer, final List<Entry<Key,Value>> list) throws MutationsRejectedException {
     for (Entry<Key,Value> e : list) {
-      Key k = e.getKey();
-      Mutation m = new Mutation(k.getRow());
-      m.put(k.getColumnFamily(), k.getColumnQualifier(), new ColumnVisibility(k.getColumnVisibility()), k.getTimestamp(), e.getValue());
-      bw.addMutation(m);
+      final Key key = e.getKey();
+      final Mutation mutation = new Mutation(key.getRow());  // NOPMD
+      ColumnVisibility colVisibility = new ColumnVisibility(key.getColumnVisibility()); // NOPMD
+      mutation.put(key.getColumnFamily(), key.getColumnQualifier(), colVisibility, key.getTimestamp(), e.getValue());
+      writer.addMutation(mutation);
     }
   }
   
   @Test
-  public void test() throws Exception {
-    MockInstance instance = new MockInstance("instance1");
-    Connector conn = instance.getConnector("root", "".getBytes());
+  public void test() throws AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException, IOException, InterruptedException {
+    final MockInstance instance = new MockInstance("instance1");
+    final Connector conn = instance.getConnector("root", "".getBytes());
     conn.tableOperations().create("test");
-    BatchWriter bw = conn.createBatchWriter("test", 100000l, 100l, 5);
-    
-    insertList(bw, row1);
-    insertList(bw, row2);
-    insertList(bw, row3);
-    bw.close();
-    
-    JobContext job = ContextFactory.createJobContext();
+    BatchWriter writer = null; // NOPMD
+    try {
+    	writer = conn.createBatchWriter("test", 100000l, 100l, 5);
+        insertList(writer, row1);
+        insertList(writer, row2);
+        insertList(writer, row3);
+    } finally {
+      if (writer != null) {
+    	  writer.close();
+      }
+    }
+    final JobContext job = ContextFactory.createJobContext();
     AccumuloRowInputFormat.setInputInfo(job.getConfiguration(), "root", "".getBytes(), "test", new Authorizations());
     AccumuloRowInputFormat.setMockInstance(job.getConfiguration(), "instance1");
-    AccumuloRowInputFormat crif = new AccumuloRowInputFormat();
-    RangeInputSplit ris = new RangeInputSplit();
-    TaskAttemptContext tac = ContextFactory.createTaskAttemptContext(job);
-    RecordReader<Text,PeekingIterator<Entry<Key,Value>>> rr = crif.createRecordReader(ris, tac);
-    rr.initialize(ris, tac);
+    final AccumuloRowInputFormat crif = new AccumuloRowInputFormat();
+    final RangeInputSplit ris = new RangeInputSplit();
+    final TaskAttemptContext tac = ContextFactory.createTaskAttemptContext(job);
+    final RecordReader<Text,PeekingIterator<Entry<Key,Value>>> recReader = crif.createRecordReader(ris, tac);
+    recReader.initialize(ris, tac);
     
-    assertTrue(rr.nextKeyValue());
-    assertEquals(new Text("row1"), rr.getCurrentKey());
-    checkLists(row1, rr.getCurrentValue());
-    assertTrue(rr.nextKeyValue());
-    assertEquals(new Text("row2"), rr.getCurrentKey());
-    checkLists(row2, rr.getCurrentValue());
-    assertTrue(rr.nextKeyValue());
-    assertEquals(new Text("row3"), rr.getCurrentKey());
-    checkLists(row3, rr.getCurrentValue());
-    assertFalse(rr.nextKeyValue());
+    assertTrue("Next key value should be true.", recReader.nextKeyValue());
+    assertEquals("Current key should be " + ROW1, new Text(ROW1), recReader.getCurrentKey());
+    checkLists(row1, recReader.getCurrentValue());
+    assertTrue("Next key value should be true.", recReader.nextKeyValue());
+    assertEquals("Current key should be " + ROW2, new Text(ROW2), recReader.getCurrentKey());
+    checkLists(row2, recReader.getCurrentValue());
+    assertTrue("Next key value should be true.", recReader.nextKeyValue());
+    assertEquals("Current key should be " + ROW3, new Text(ROW3), recReader.getCurrentKey());
+    checkLists(row3, recReader.getCurrentValue());
+    assertFalse("Next key value should be false.", recReader.nextKeyValue());
   }
 }

Modified: accumulo/branches/ACCUMULO-722/1.5/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java Tue Sep 11 18:00:17 2012
@@ -159,8 +159,8 @@ public class RandomBatchScanner {
     
     long t2 = System.currentTimeMillis();
     
-    log.info(String.format("%6.2f lookups/sec %6.2f secs\n", num / ((t2 - t1) / 1000.0), ((t2 - t1) / 1000.0)));
-    log.info(String.format("num results : %,d\n", receiver.count));
+    log.info(String.format("%6.2f lookups/sec %6.2f secs%n", num / ((t2 - t1) / 1000.0), ((t2 - t1) / 1000.0)));
+    log.info(String.format("num results : %,d%n", receiver.count));
     
     printRowsNotFound(expectedRows);
   }

Modified: accumulo/branches/ACCUMULO-722/1.5/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java Tue Sep 11 18:00:17 2012
@@ -274,11 +274,11 @@ public class FileCount {
     
     long t3 = System.currentTimeMillis();
     
-    System.out.printf("Max depth              : %d\n", depth);
-    System.out.printf("Time to find max depth : %,d ms\n", (t2 - t1));
-    System.out.printf("Time to compute counts : %,d ms\n", (t3 - t2));
-    System.out.printf("Entries scanned        : %,d \n", entriesScanned);
-    System.out.printf("Counts inserted        : %,d \n", inserts);
+    System.out.printf("Max depth              : %d%n", depth);
+    System.out.printf("Time to find max depth : %,d ms%n", (t2 - t1));
+    System.out.printf("Time to compute counts : %,d ms%n", (t3 - t2));
+    System.out.printf("Entries scanned        : %,d %n", entriesScanned);
+    System.out.printf("Counts inserted        : %,d %n", inserts);
   }
   
   public static void main(String[] args) throws Exception {

Modified: accumulo/branches/ACCUMULO-722/1.5/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java Tue Sep 11 18:00:17 2012
@@ -89,7 +89,7 @@ public class ContinuousQuery {
       }
       long t2 = System.currentTimeMillis();
       
-      System.out.printf("  %s %,d %6.3f\n", Arrays.asList(columns), count, (t2 - t1) / 1000.0);
+      System.out.printf("  %s %,d %6.3f%n", Arrays.asList(columns), count, (t2 - t1) / 1000.0);
     }
     
     bs.close();

Modified: accumulo/branches/ACCUMULO-722/1.5/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java Tue Sep 11 18:00:17 2012
@@ -114,7 +114,7 @@ public class AdminUtil<T> {
       
       zs.unreserve(tid, 0);
       
-      System.out.printf("txid: %016x  status: %-18s  op: %-15s  locked: %-15s locking: %-15s top: %s\n", tid, status, debug, hlocks, wlocks, top);
+      System.out.printf("txid: %016x  status: %-18s  op: %-15s  locked: %-15s locking: %-15s top: %s%n", tid, status, debug, hlocks, wlocks, top);
     }
     
     if (heldLocks.size() != 0 || waitingLocks.size() != 0) {
@@ -122,10 +122,10 @@ public class AdminUtil<T> {
       System.out.println("The following locks did not have an associated FATE operation");
       System.out.println();
       for (Entry<Long,List<String>> entry : heldLocks.entrySet())
-        System.out.printf("txid: %016x  locked: %s\n", entry.getKey(), entry.getValue());
+        System.out.printf("txid: %016x  locked: %s%n", entry.getKey(), entry.getValue());
       
       for (Entry<Long,List<String>> entry : waitingLocks.entrySet())
-        System.out.printf("txid: %016x  locking: %s\n", entry.getKey(), entry.getValue());
+        System.out.printf("txid: %016x  locking: %s%n", entry.getKey(), entry.getValue());
     }
   }
   

Propchange: accumulo/branches/ACCUMULO-722/1.5/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/server:r1356924-1358205,1358207-1382577,1382613
  Merged /accumulo/branches/1.4/src/server:r1382566,1382923
  Merged /accumulo/trunk/server:r1382042-1383490

Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java Tue Sep 11 18:00:17 2012
@@ -748,15 +748,15 @@ public class BulkImporter {
         failedTablets.addAll(ft);
       
       sb.append("BULK IMPORT ASSIGNMENT STATISTICS\n");
-      sb.append(String.format("# of map files            : %,10d\n", numUniqueMapFiles));
-      sb.append(String.format("# map files with failures : %,10d %6.2f%s\n", completeFailures.size(), completeFailures.size() * 100.0 / numUniqueMapFiles, "%"));
-      sb.append(String.format("# failed failed map files : %,10d %s\n", failedFailures.size(), failedFailures.size() > 0 ? " <-- THIS IS BAD" : ""));
-      sb.append(String.format("# of tablets              : %,10d\n", counts.size()));
-      sb.append(String.format("# tablets imported to     : %,10d %6.2f%s\n", tabletsImportedTo, tabletsImportedTo * 100.0 / counts.size(), "%"));
-      sb.append(String.format("# tablets with failures   : %,10d %6.2f%s\n", failedTablets.size(), failedTablets.size() * 100.0 / counts.size(), "%"));
-      sb.append(String.format("min map files per tablet  : %,10d\n", min));
-      sb.append(String.format("max map files per tablet  : %,10d\n", max));
-      sb.append(String.format("avg map files per tablet  : %,10.2f (std dev = %.2f)\n", totalAssignments / (double) counts.size(), stddev));
+      sb.append(String.format("# of map files            : %,10d%n", numUniqueMapFiles));
+      sb.append(String.format("# map files with failures : %,10d %6.2f%s%n", completeFailures.size(), completeFailures.size() * 100.0 / numUniqueMapFiles, "%"));
+      sb.append(String.format("# failed failed map files : %,10d %s%n", failedFailures.size(), failedFailures.size() > 0 ? " <-- THIS IS BAD" : ""));
+      sb.append(String.format("# of tablets              : %,10d%n", counts.size()));
+      sb.append(String.format("# tablets imported to     : %,10d %6.2f%s%n", tabletsImportedTo, tabletsImportedTo * 100.0 / counts.size(), "%"));
+      sb.append(String.format("# tablets with failures   : %,10d %6.2f%s%n", failedTablets.size(), failedTablets.size() * 100.0 / counts.size(), "%"));
+      sb.append(String.format("min map files per tablet  : %,10d%n", min));
+      sb.append(String.format("max map files per tablet  : %,10d%n", max));
+      sb.append(String.format("avg map files per tablet  : %,10.2f (std dev = %.2f)%n", totalAssignments / (double) counts.size(), stddev));
       return sb.toString();
     }
   }

Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java Tue Sep 11 18:00:17 2012
@@ -254,10 +254,10 @@ public class SimpleGarbageCollector impl
         // STEP 3: delete files
         if (safemode) {
           if (verbose)
-            System.out.println("SAFEMODE: There are " + candidates.size() + " data file candidates marked for deletion.\n"
-                + "          Examine the log files to identify them.\n" + "          They can be removed by executing: bin/accumulo gc --offline\n"
-                + "WARNING:  Do not run the garbage collector in offline mode unless you are positive\n"
-                + "          that the accumulo METADATA table is in a clean state, or that accumulo\n"
+            System.out.println("SAFEMODE: There are " + candidates.size() + " data file candidates marked for deletion.%n"
+                + "          Examine the log files to identify them.%n" + "          They can be removed by executing: bin/accumulo gc --offline%n"
+                + "WARNING:  Do not run the garbage collector in offline mode unless you are positive%n"
+                + "          that the accumulo METADATA table is in a clean state, or that accumulo%n"
                 + "          has not yet been run, in the case of an upgrade.");
           log.info("SAFEMODE: Listing all data file candidates for deletion");
           for (String s : candidates)

Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTrace.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTrace.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTrace.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTrace.java Tue Sep 11 18:00:17 2012
@@ -98,8 +98,8 @@ public class ShowTrace extends Basic {
       @Override
       public void visit(int level, RemoteSpan parent, RemoteSpan node, Collection<RemoteSpan> children) {
         sb.append("<tr>\n");
-        sb.append(String.format("<td class='right'>%d+</td><td class='left'>%d</td>\n", node.stop - node.start, node.start - finalStart));
-        sb.append(String.format("<td style='text-indent: %dpx'>%s@%s</td>\n", level * 5, node.svc, node.sender));
+        sb.append(String.format("<td class='right'>%d+</td><td class='left'>%d</td>%n", node.stop - node.start, node.start - finalStart));
+        sb.append(String.format("<td style='text-indent: %dpx'>%s@%s</td>%n", level * 5, node.svc, node.sender));
         sb.append("<td>" + node.description + "</td>");
         boolean hasData = node.data != null && !node.data.isEmpty();
         if (hasData)
@@ -112,7 +112,7 @@ public class ShowTrace extends Basic {
         sb.append("  <table class='indent,noborder'>\n");
         for (Entry<String,String> entry : node.data.entrySet()) {
           sb.append("  <tr><td>" + BasicServlet.sanitize(entry.getKey()) + "</td>");
-          sb.append("<td>" + BasicServlet.sanitize(entry.getValue()) + "</td></tr>\n");
+          sb.append("<td>" + BasicServlet.sanitize(entry.getValue()) + "</td></tr>%n");
         }
         sb.append("  </table>");
         sb.append("</td>\n");

Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java Tue Sep 11 18:00:17 2012
@@ -193,7 +193,7 @@ public class LargestFirstMemoryManager i
   
   public static void main(String[] args) {
     for (int i = 0; i < 62; i++) {
-      System.out.printf("%d\t%d\n", i, timeMemoryLoad(1, i * 60000l));
+      System.out.printf("%d\t%d%n", i, timeMemoryLoad(1, i * 60000l));
     }
   }
 }

Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java Tue Sep 11 18:00:17 2012
@@ -3055,7 +3055,7 @@ public class Tablet {
           if (candidate.compareRow(lastRow) != 0) {
             // we should use this ratio in split size estimations
             if (log.isTraceEnabled())
-              log.trace(String.format("Splitting at %6.2f instead of .5, row at .5 is same as end row\n", keys.firstKey()));
+              log.trace(String.format("Splitting at %6.2f instead of .5, row at .5 is same as end row%n", keys.firstKey()));
             return new SplitRowSpec(keys.firstKey(), candidate.getRow());
           }
           

Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/EstimateInMemMapOverhead.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/EstimateInMemMapOverhead.java?rev=1383499&r1=1383498&r2=1383499&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/EstimateInMemMapOverhead.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/EstimateInMemMapOverhead.java Tue Sep 11 18:00:17 2012
@@ -63,7 +63,7 @@ abstract class MemoryUsageTest {
     double diff = actualBytesPerEntry - expectedBytesPerEntry;
     double ratio = actualBytesPerEntry / expectedBytesPerEntry * 100;
     
-    System.out.printf("%30s | %,10d | %6.2fGB | %6.2f | %6.2f | %6.2f | %6.2f%s\n", getName(), getNumPasses(), memSize / (1024 * 1024 * 1024.0),
+    System.out.printf("%30s | %,10d | %6.2fGB | %6.2f | %6.2f | %6.2f | %6.2f%s%n", getName(), getNumPasses(), memSize / (1024 * 1024 * 1024.0),
         actualBytesPerEntry, expectedBytesPerEntry, diff, ratio, "%");
     
     clear();



Mime
View raw message