accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [23/23] accumulo git commit: Merge branch '1.8'
Date Mon, 20 Jun 2016 23:50:15 GMT
Merge branch '1.8'

Conflicts:
	server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5c576af1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5c576af1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5c576af1

Branch: refs/heads/master
Commit: 5c576af1ecbff2ef276510375ba9db40d2ae9df2
Parents: 371a95c 94bf129
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Mon Jun 20 19:49:32 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Mon Jun 20 19:49:32 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     |  5 ++
 .../accumulo/server/util/TServerUtilsTest.java  |  5 ++
 7 files changed, 57 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c576af1/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
index 9c1a05d,22fcb8b..a5e27cb
--- a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
@@@ -28,9 -27,12 +28,7 @@@ import org.apache.accumulo.core.Constan
  import org.apache.accumulo.core.util.Pair;
  import org.apache.commons.lang.math.IntRange;
  import org.apache.hadoop.fs.Path;
- import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
  
 -import com.google.common.base.Function;
 -import com.google.common.base.Predicate;
 -import com.google.common.base.Predicates;
 -import com.google.common.collect.Collections2;
 -
  /**
   * Types of {@link Property} values. Each type has a short name, a description, and a regex
which valid values match. All of these fields are optional.
   */

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c576af1/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c576af1/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
----------------------------------------------------------------------


Mime
View raw message