Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E7C9B200C4C for ; Mon, 20 Mar 2017 19:05:59 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E6849160B71; Mon, 20 Mar 2017 18:05:59 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3DD52160B76 for ; Mon, 20 Mar 2017 19:05:59 +0100 (CET) Received: (qmail 82733 invoked by uid 500); 20 Mar 2017 18:05:58 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 82712 invoked by uid 99); 20 Mar 2017 18:05:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Mar 2017 18:05:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C30FBDFFC0; Mon, 20 Mar 2017 18:05:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mmiller@apache.org To: commits@accumulo.apache.org Date: Mon, 20 Mar 2017 18:05:57 -0000 Message-Id: <2fe3b90137d745bfa9d8515105523dcf@git.apache.org> In-Reply-To: <55fc55ccbb504ca9b0bc4a687d2e4329@git.apache.org> References: <55fc55ccbb504ca9b0bc4a687d2e4329@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] accumulo git commit: Merge branch '1.8' archived-at: Mon, 20 Mar 2017 18:06:00 -0000 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 Authored: Mon Mar 20 13:58:34 2017 -0400 Committer: Mike Miller 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 ----------------------------------------------------------------------