Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2a0375ad Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2a0375ad Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2a0375ad Branch: refs/heads/master Commit: 2a0375add0787e4e34cd98711d0f2e735240f2b3 Parents: 6f4c9fe 4ea66d4 Author: Josh Elser <els...@apache.org> Authored: Tue Jan 17 16:38:14 2017 -0500 Committer: Josh Elser <els...@apache.org> Committed: Tue Jan 17 16:38:14 2017 -0500 ---------------------------------------------------------------------- .../accumulo/server/master/balancer/DefaultLoadBalancer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------