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/d0745186 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d0745186 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d0745186 Branch: refs/heads/master Commit: d07451861996453755b873f3c3cfae9a9fa8bad5 Parents: 121cc6b 8dd229c Author: Eric C. Newton <eric.new...@gmail.com> Authored: Tue Jun 23 16:23:14 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Tue Jun 23 16:23:14 2015 -0400 ---------------------------------------------------------------------- .../apache/accumulo/test/DetectDeadTabletServers.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
