Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 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/e1c9a1f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e1c9a1f6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e1c9a1f6 Branch: refs/heads/1.6.1-SNAPSHOT Commit: e1c9a1f6c896f39534a95236a2e0fc0409d88b5b Parents: 8959d26 dcb081c Author: Keith Turner <ktur...@apache.org> Authored: Fri Sep 19 18:20:13 2014 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Fri Sep 19 18:20:13 2014 -0400 ---------------------------------------------------------------------- .../test/functional/HalfDeadTServerIT.java | 58 ++++++++++++-------- 1 file changed, 36 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
