Merge remote-tracking branch 'origin/1.7' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3e687e9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3e687e9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d3e687e9 Branch: refs/heads/1.8 Commit: d3e687e93f1a4d01ca3038c52896ac5d9a2c4af1 Parents: 78a56a2 976c0aa Author: Josh Elser <els...@apache.org> Authored: Mon Jun 20 23:32:55 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Jun 20 23:32:55 2016 -0400 ---------------------------------------------------------------------- .../master/balancer/BaseHostRegexTableLoadBalancerTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
