You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2016/05/20 17:11:02 UTC
[2/4] accumulo git commit: Merge branch '1.6' into 1.7
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b3df3543
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b3df3543
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b3df3543
Branch: refs/heads/master
Commit: b3df354344e9a287d2cac28d9bcc073f225d8516
Parents: 7cffcfc b363e88
Author: Dave Marion <dl...@apache.org>
Authored: Fri May 20 12:48:16 2016 -0400
Committer: Dave Marion <dl...@apache.org>
Committed: Fri May 20 12:48:16 2016 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
.../classloader/vfs/AccumuloVFSClassLoader.java | 4 +-
.../vfs/providers/HdfsFileAttributes.java | 59 -----
.../providers/HdfsFileContentInfoFactory.java | 50 ----
.../vfs/providers/HdfsFileObject.java | 240 -------------------
.../vfs/providers/HdfsFileProvider.java | 65 -----
.../vfs/providers/HdfsFileSystem.java | 126 ----------
.../providers/HdfsFileSystemConfigBuilder.java | 45 ----
.../vfs/providers/HdfsRandomAccessContent.java | 228 ------------------
.../classloader/vfs/providers/package.html | 19 --
.../providers/ReadOnlyHdfsFileProviderTest.java | 2 +
.../apache/accumulo/test/AccumuloDFSBase.java | 2 +-
12 files changed, 6 insertions(+), 836 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b3df3543/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b3df3543/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
----------------------------------------------------------------------
diff --cc start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
index 4df3f40,98b3b54..8c7067f
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
@@@ -40,10 -38,11 +38,12 @@@ import org.apache.commons.vfs2.impl.Def
import org.apache.commons.vfs2.impl.FileContentInfoFilenameFactory;
import org.apache.commons.vfs2.impl.VFSClassLoader;
import org.apache.commons.vfs2.provider.FileReplicator;
+ import org.apache.commons.vfs2.provider.hdfs.HdfsFileObject;
+ import org.apache.commons.vfs2.provider.hdfs.HdfsFileProvider;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class builds a hierarchy of Classloaders in the form of:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b3df3543/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
----------------------------------------------------------------------