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/190e0b5f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/190e0b5f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/190e0b5f Branch: refs/heads/master Commit: 190e0b5f78713639385f4819b7430512661911a8 Parents: 6e641f4 46585ab Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Dec 17 15:04:11 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Dec 17 15:04:11 2013 -0500 ---------------------------------------------------------------------- .../accumulo/server/master/balancer/DefaultLoadBalancer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------