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/0f9eb884 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f9eb884 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f9eb884 Branch: refs/heads/master Commit: 0f9eb884a65df02e6cebc6c2b9956e455d303cd5 Parents: 2412419 1970b58 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Tue Mar 25 10:38:19 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Tue Mar 25 10:38:19 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
