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/5ac7498c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5ac7498c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5ac7498c Branch: refs/heads/master Commit: 5ac7498c0fd654f71159bd493136fa188ce50404 Parents: b9b1596 741c83c Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Dec 17 15:06:21 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Dec 17 15:06:21 2013 -0500 ---------------------------------------------------------------------- .../master/balancer/DefaultLoadBalancer.java | 3 +- .../master/state/MetaDataTableScanner.java | 1 + .../test/functional/MasterAssignmentIT.java | 88 ++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
