You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by el...@apache.org on 2015/01/10 01:59:38 UTC

[9/9] accumulo git commit: Merge branch '1.6'

Merge branch '1.6'

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9edeca84
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9edeca84
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9edeca84

Branch: refs/heads/master
Commit: 9edeca84de9ffa44d4352592ebe9c5a9c949d7ab
Parents: 55b60dd 14f9f00
Author: Josh Elser <el...@apache.org>
Authored: Fri Jan 9 19:59:12 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jan 9 19:59:12 2015 -0500

----------------------------------------------------------------------
 core/src/main/java/org/apache/accumulo/core/data/Range.java      | 2 ++
 .../src/main/java/org/apache/accumulo/tserver/tablet/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/9edeca84/core/src/main/java/org/apache/accumulo/core/data/Range.java
----------------------------------------------------------------------