accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject [1/2] accumulo git commit: ACCUMULO-3883 fix how StandaloneAccumuloClusterConfiguration loads ClientConfiguration
Date Wed, 03 Jun 2015 02:12:32 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 0b7d8eeae -> 3d9336b83


ACCUMULO-3883 fix how StandaloneAccumuloClusterConfiguration loads ClientConfiguration


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

Branch: refs/heads/master
Commit: 92d19eeb7df0a902c594eec5081173d56f06488e
Parents: 5bd993b
Author: Billie Rinaldi <billie@apache.org>
Authored: Tue Jun 2 19:10:24 2015 -0700
Committer: Billie Rinaldi <billie@apache.org>
Committed: Tue Jun 2 19:10:24 2015 -0700

----------------------------------------------------------------------
 .../harness/conf/StandaloneAccumuloClusterConfiguration.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/92d19eeb/test/src/test/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java
b/test/src/test/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java
index e04c10c..4cf145b 100644
--- a/test/src/test/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java
+++ b/test/src/test/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java
@@ -86,9 +86,8 @@ public class StandaloneAccumuloClusterConfiguration extends AccumuloClusterPrope
 
     this.conf = getConfiguration(type);
     this.clientConfFile = clientConfFile;
-    this.clientConf = ClientConfiguration.loadDefault();
     try {
-      clientConf.addConfiguration(new ClientConfiguration(clientConfFile));
+      this.clientConf = new ClientConfiguration(clientConfFile);
     } catch (ConfigurationException e) {
       throw new RuntimeException("Failed to load client configuration from " + clientConfFile);
     }


Mime
View raw message