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/f0c945a8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f0c945a8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f0c945a8 Branch: refs/heads/master Commit: f0c945a81a6340a03bed88b0003577b3a7546046 Parents: 62cf3df 7a40f7b Author: Josh Elser <els...@apache.org> Authored: Thu Sep 18 18:12:48 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Sep 18 18:12:48 2014 -0400 ---------------------------------------------------------------------- .../functional/BalanceAfterCommsFailureIT.java | 30 +++++++++---- .../functional/SimpleBalancerFairnessIT.java | 44 ++++++++++++++------ 2 files changed, 53 insertions(+), 21 deletions(-) ----------------------------------------------------------------------