You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2016/04/12 15:58:30 UTC
[13/39] accumulo git commit: Merge branch '1.7'
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/57423429
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/57423429
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/57423429
Branch: refs/heads/ACCUMULO-4173
Commit: 574234293147bbc63863d3210eb2baf94c5387f6
Parents: 0dd1d6a 2e4f320
Author: Keith Turner <kt...@apache.org>
Authored: Fri Apr 1 13:00:21 2016 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Fri Apr 1 13:00:21 2016 -0400
----------------------------------------------------------------------
core/src/main/findbugs/exclude-filter.xml | 5 +
.../core/file/blockfile/ABlockReader.java | 2 +
.../file/blockfile/impl/CachableBlockFile.java | 31 ++-
.../impl/SeekableByteArrayInputStream.java | 141 ++++++++++++
.../core/file/rfile/MultiLevelIndex.java | 219 +++++++++++++------
5 files changed, 308 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/57423429/core/src/main/findbugs/exclude-filter.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/57423429/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/57423429/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
----------------------------------------------------------------------