Merge remote-tracking branch 'origin/1.8' 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/af802612 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/af802612 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/af802612 Branch: refs/heads/1.8 Commit: af802612965e903a7bfa034bc2afaa02e21ad735 Parents: a24a286 94bf129 Author: Josh Elser <els...@apache.org> Authored: Mon Jun 20 23:33:11 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Jun 20 23:33:11 2016 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/conf/PropertyType.java | 3 - .../core/metadata/MetadataLocationObtainer.java | 21 ++++--- .../core/client/impl/ScannerOptionsTest.java | 58 +++++++++++--------- pom.xml | 2 +- .../accumulo/server/rpc/TServerUtils.java | 4 +- .../BaseHostRegexTableLoadBalancerTest.java | 7 ++- .../accumulo/server/util/TServerUtilsTest.java | 5 ++ 7 files changed, 58 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/af802612/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java ----------------------------------------------------------------------
