[2/3] accumulo git commit: Merge branch '1.5' into 1.6

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/0bcbab7d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0bcbab7d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0bcbab7d

[2/3] accumulo git commit: Merge branch '1.5' into 1.6

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/5a42b1f2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a42b1f2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5a42b1f2

[2/3] accumulo git commit: Merge branch '1.5' into 1.6

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/14e3a7d5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/14e3a7d5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/14e3a7d5

[2/3] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1ea90109 Tree: http://git-wip-us.apache.org

[2/3] accumulo git commit: Merge branch '1.5' into 1.6

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/5a6e8589 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a6e8589 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5a6e8589

[2/3] accumulo git commit: Merge branch '1.5' into 1.6

http://git-wip-us.apache.org/repos/asf/accumulo/blob/837a0bdf/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java index 7420ec4,