Merge branch '1.6'
Conflicts:
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/da676d5f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/da676d5f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/da676d5f
Branch: refs/heads/master
Commit: da676d5f7dc39f4b26180cb853ff1973b1ffe0b3
Parents: e614548 837a0bd
Author: Keith Turner <ktur...@apache.org>
Authored: Thu Jan 29 17:00:55 2015 -0500
Committer: Keith Turner <ktur...@apache.org>
Committed: Thu Jan 29 17:00:55 2015 -0500
----------------------------------------------------------------------
.../apache/accumulo/tserver/tablet/Tablet.java | 28 +++++++++++---------
1 file changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
