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/568f3ddb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/568f3ddb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/568f3ddb Branch: refs/heads/master Commit: 568f3ddb81c7aad0360d166f382643e9f25df5fd Parents: 8158f55 b54b130 Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Dec 17 15:56:05 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Dec 17 15:56:05 2013 -0500 ---------------------------------------------------------------------- .../balancer/DefaultLoadBalancerTest.java | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) ----------------------------------------------------------------------