accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/5] git commit: ACCUMULO-378 Use the system configuration, not site configuration so we pull from zk too
Date Thu, 22 May 2014 17:59:49 GMT
Repository: accumulo
Updated Branches:
  refs/heads/ACCUMULO-378 4ac04b95d -> e798d5008


ACCUMULO-378 Use the system configuration, not site configuration so we pull from zk too


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

Branch: refs/heads/ACCUMULO-378
Commit: da0a228d861952979b1dcc3bb561e2860719203a
Parents: 4ac04b9
Author: Josh Elser <elserj@apache.org>
Authored: Wed May 21 16:49:43 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Wed May 21 16:49:43 2014 -0400

----------------------------------------------------------------------
 .../apache/accumulo/tserver/replication/AccumuloReplicaSystem.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/da0a228d/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
index 64244c5..6cd3358 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
@@ -125,7 +125,7 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
     instanceName = configuration.substring(0, index);
     zookeepers = configuration.substring(index + 1);
 
-    conf = ServerConfiguration.getSiteConfiguration();
+    conf = ServerConfiguration.getSystemConfiguration(HdfsZooInstance.getInstance());
 
     try {
       fs = VolumeManagerImpl.get(conf);


Mime
View raw message