You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2017/01/11 22:42:18 UTC

[5/7] accumulo git commit: Merge branch '1.7' into 1.8

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/6f4c9fee
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6f4c9fee
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6f4c9fee

Branch: refs/heads/1.8
Commit: 6f4c9feee99d4dda16e4044842a0371b23f050c7
Parents: 4cc53bb 1b2f40a
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Jan 11 17:23:30 2017 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Jan 11 17:23:30 2017 -0500

----------------------------------------------------------------------
 .../master/balancer/ChaoticLoadBalancer.java    |  1 +
 .../server/master/balancer/TabletBalancer.java  |  4 ++++
 ...gexTableLoadBalancerReconfigurationTest.java |  5 ++---
 .../HostRegexTableLoadBalancerTest.java         | 21 ++++++++++----------
 4 files changed, 17 insertions(+), 14 deletions(-)
----------------------------------------------------------------------