Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/121cc6bc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/121cc6bc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/121cc6bc Branch: refs/heads/master Commit: 121cc6bc0e04167ca110f88f841ccfd38b10f5ba Parents: eabdc83 7985b91 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Tue Jun 23 15:33:55 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Tue Jun 23 15:33:55 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/master/Master.java | 4 +- .../accumulo/test/DetectDeadTabletServers.java | 96 ++++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/121cc6bc/server/master/src/main/java/org/apache/accumulo/master/Master.java ----------------------------------------------------------------------
