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/8668c7f3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8668c7f3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8668c7f3 Branch: refs/heads/1.8 Commit: 8668c7f381832128d6bf76e8b6097778a42b71c4 Parents: b903766 ff134d2 Author: Dave Marion <dlmar...@apache.org> Authored: Wed Jan 25 16:11:20 2017 -0500 Committer: Dave Marion <dlmar...@apache.org> Committed: Wed Jan 25 16:11:20 2017 -0500 ---------------------------------------------------------------------- .../balancer/HostRegexTableLoadBalancer.java | 86 ++++++++++---------- .../BaseHostRegexTableLoadBalancerTest.java | 14 +++- ...gexTableLoadBalancerReconfigurationTest.java | 5 +- .../HostRegexTableLoadBalancerTest.java | 7 +- 4 files changed, 60 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8668c7f3/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8668c7f3/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java ----------------------------------------------------------------------
