Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' 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/4d5ba9da Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d5ba9da Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4d5ba9da Branch: refs/heads/ACCUMULO-378 Commit: 4d5ba9daf0eedbd14df0e8d49a0fd3e38a8fa48f Parents: 18c0e8e 1c38957 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri May 2 18:18:34 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri May 2 18:18:34 2014 -0400 ---------------------------------------------------------------------- pom.xml | 3 ++ .../test/functional/HalfDeadTServerIT.java | 15 +++--- .../accumulo/test/randomwalk/FrameworkTest.java | 48 ++++++++++---------- 3 files changed, 36 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d5ba9da/pom.xml ----------------------------------------------------------------------
