Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/14f9f00e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/14f9f00e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/14f9f00e Branch: refs/heads/1.6 Commit: 14f9f00e5d586b44316c8d367247df7a522a15be Parents: 02142ff 19cd209 Author: Josh Elser <els...@apache.org> Authored: Fri Jan 9 18:44:53 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Fri Jan 9 18:44:53 2015 -0500 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/data/Range.java | 2 ++ .../src/main/java/org/apache/accumulo/tserver/Tablet.java | 4 +++- .../apache/accumulo/test/randomwalk/sequential/BatchVerify.java | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/14f9f00e/core/src/main/java/org/apache/accumulo/core/data/Range.java ----------------------------------------------------------------------
