Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/862979a0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/862979a0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/862979a0 Branch: refs/heads/master Commit: 862979a06f494e0d8fde8be51005bc2a3c721c2b Parents: 0a42188 dcb081c Author: Josh Elser <els...@apache.org> Authored: Fri Sep 19 18:14:40 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Sep 19 18:14:40 2014 -0400 ---------------------------------------------------------------------- .../test/functional/HalfDeadTServerIT.java | 58 ++++++++++++-------- 1 file changed, 36 insertions(+), 22 deletions(-) ----------------------------------------------------------------------