accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [13/13] accumulo git commit: Merge branch '1.8'
Date Thu, 15 Sep 2016 19:33:21 GMT
Merge branch '1.8'


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

Branch: refs/heads/master
Commit: c48a2bac38039750ab590383fa69576f3137c04e
Parents: e900e67 4ce0338
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Sep 15 15:15:49 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Sep 15 15:15:49 2016 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/core/conf/Property.java |  8 +++++
 .../accumulo/core/conf/SiteConfiguration.java   | 24 ++++++++++++-
 .../accumulo/server/client/HdfsZooInstance.java | 36 +++++++++++++-------
 3 files changed, 54 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c48a2bac/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
index e5e78d0,07aaf9f..753874a
--- a/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
@@@ -17,9 -17,10 +17,11 @@@
  package org.apache.accumulo.core.conf;
  
  import java.io.IOException;
+ import java.util.Collections;
+ import java.util.HashMap;
  import java.util.Map;
  import java.util.Map.Entry;
 +import java.util.function.Predicate;
  
  import org.apache.accumulo.core.util.CachedConfiguration;
  import org.apache.hadoop.conf.Configuration;


Mime
View raw message