Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7985b917 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7985b917 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7985b917 Branch: refs/heads/1.7 Commit: 7985b917d0ef4b68e00c3e9c6880bd3aa983aa59 Parents: 61bb1b4 c3bb4c6 Author: Eric C. Newton <[email protected]> Authored: Tue Jun 23 15:33:30 2015 -0400 Committer: Eric C. Newton <[email protected]> Committed: Tue Jun 23 15:33:30 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/7985b917/server/master/src/main/java/org/apache/accumulo/master/Master.java ----------------------------------------------------------------------
