Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7988f8f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7988f8f6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7988f8f6 Branch: refs/heads/master Commit: 7988f8f6c5bd023e584382b9e92ed6d5cb112d54 Parents: fbb18d6 acce1d5 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Thu Mar 20 14:41:11 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Thu Mar 20 14:41:11 2014 -0400 ---------------------------------------------------------------------- .../accumulo/test/functional/HalfDeadTServerIT.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
