You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mm...@apache.org on 2017/03/20 18:05:57 UTC
[2/2] accumulo git commit: Merge branch '1.8'
Merge branch '1.8'
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManager.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cf69e3f6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cf69e3f6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cf69e3f6
Branch: refs/heads/master
Commit: cf69e3f675b8b3445a0e01de4331f0fd16e1e43f
Parents: 94cdcc4 f02b731
Author: Mike Miller <mm...@apache.org>
Authored: Mon Mar 20 13:58:34 2017 -0400
Committer: Mike Miller <mm...@apache.org>
Committed: Mon Mar 20 13:58:34 2017 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/server/fs/VolumeManager.java | 4 ++++
.../java/org/apache/accumulo/server/fs/VolumeManagerImpl.java | 5 +++++
.../main/java/org/apache/accumulo/server/init/Initialize.java | 3 ++-
3 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cf69e3f6/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManager.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManager.java
index 09436a5,69f883f..06ece48
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManager.java
@@@ -28,6 -27,9 +28,7 @@@ import org.apache.hadoop.fs.FSDataInput
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
-
-import com.google.common.base.Optional;
+ import org.apache.hadoop.fs.permission.FsPermission;
/**
* A wrapper around multiple hadoop FileSystem objects, which are assumed to be different volumes. This also concentrates a bunch of meta-operations like
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cf69e3f6/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cf69e3f6/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------