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/7a826251 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7a826251 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7a826251 Branch: refs/heads/ACCUMULO-378 Commit: 7a826251d6e988433e1a5cc33b08506640637663 Parents: 43a44ba b3c8936 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Wed Apr 30 12:16:05 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Wed Apr 30 12:16:05 2014 -0400 ---------------------------------------------------------------------- .../accumulo/test/functional/HalfDeadTServerIT.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
