Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
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/d274a8ed
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d274a8ed
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d274a8ed
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: d274a8ed4b7c2be17a013293596c58482260c121
Parents: d7c1125 3c513c8
Author: Josh Elser <els...@apache.org>
Authored: Wed Jul 23 11:45:32 2014 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Wed Jul 23 11:45:32 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/tserver/Tablet.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
