You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2013/05/14 18:47:07 UTC
svn commit: r1482447 - in /accumulo/trunk: ./ core/
core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
Author: vines
Date: Tue May 14 16:47:06 2013
New Revision: 1482447
URL: http://svn.apache.org/r1482447
Log:
ACCUMULO-974 - Applying Tim Reardon's patch for Mock
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1482445
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1482445
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java?rev=1482447&r1=1482446&r2=1482447&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java Tue May 14 16:47:06 2013
@@ -34,6 +34,7 @@ import org.apache.accumulo.core.conf.Acc
import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.TextUtil;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.io.Text;
@@ -62,6 +63,9 @@ public class MockInstance implements Ins
static FileSystem getDefaultFileSystem() {
try {
+ Configuration conf = CachedConfiguration.getInstance();
+ conf.set("fs.file.impl", "org.apache.hadoop.fs.LocalFileSystem");
+ conf.set("fs.default.name", "file:///");
return FileSystem.get(CachedConfiguration.getInstance());
} catch (IOException ex) {
throw new RuntimeException(ex);