Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d33b2a09 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d33b2a09 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d33b2a09 Branch: refs/heads/master Commit: d33b2a09db1336d0734a3dc4f034c910ed751025 Parents: d10840b 63a8a5d Author: Keith Turner <[email protected]> Authored: Tue May 31 18:50:37 2016 -0400 Committer: Keith Turner <[email protected]> Committed: Tue May 31 18:50:37 2016 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/file/rfile/RFile.java | 32 ++++++++-- .../accumulo/core/file/rfile/RFileTest.java | 63 ++++++++++++++++++++ 2 files changed, 91 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d33b2a09/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java ---------------------------------------------------------------------- diff --cc core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java index 060d956,2fc4e4a..af9011d --- a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java +++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java @@@ -64,9 -64,9 +64,10 @@@ import org.apache.accumulo.core.iterato import org.apache.accumulo.core.iterators.system.LocalityGroupIterator.LocalityGroup; import org.apache.accumulo.core.util.MutableByteSequence; import org.apache.commons.lang.mutable.MutableLong; + import org.apache.commons.math.stat.descriptive.SummaryStatistics; import org.apache.hadoop.io.Writable; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RFile { http://git-wip-us.apache.org/repos/asf/accumulo/blob/d33b2a09/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java ----------------------------------------------------------------------
