Merge branch '1.5' into 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/837a0bdf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/837a0bdf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/837a0bdf
Branch: refs/heads/master
Commit: 837a0bdf95e74899a088578ae2551c24ff3138a2
Parents: abf0b99 8b54f13
Author: Keith Turner <ktur...@apache.org>
Authored: Thu Jan 29 16:49:08 2015 -0500
Committer: Keith Turner <ktur...@apache.org>
Committed: Thu Jan 29 16:49:08 2015 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/tserver/Tablet.java | 37 ++++++++++----------
1 file changed, 19 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
