Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4365784b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4365784b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4365784b Branch: refs/heads/master Commit: 4365784b7c642d0d946b76d8f30b66065215305d Parents: ca23e0c ef6ba24 Author: John Vines <jvi...@gmail.com> Authored: Mon Nov 4 12:08:53 2013 -0500 Committer: John Vines <jvi...@gmail.com> Committed: Mon Nov 4 12:08:53 2013 -0500 ---------------------------------------------------------------------- .../accumulo/core/file/rfile/bcfile/BCFile.java | 469 ++-- .../accumulo/core/file/rfile/bcfile/Chunk.java | 418 ---- .../core/file/rfile/bcfile/Compression.java | 17 +- .../accumulo/core/file/rfile/bcfile/TFile.java | 2030 ------------------ .../core/file/rfile/bcfile/TFileDumper.java | 258 --- 5 files changed, 247 insertions(+), 2945 deletions(-) ----------------------------------------------------------------------
