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 7D4E3200B89 for ; Wed, 17 Aug 2016 02:18:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 79389160AA8; Wed, 17 Aug 2016 00:18:31 +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 57FC6160AC2 for ; Wed, 17 Aug 2016 02:18:30 +0200 (CEST) Received: (qmail 38775 invoked by uid 500); 17 Aug 2016 00:18:29 -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 38583 invoked by uid 99); 17 Aug 2016 00:18:29 -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; Wed, 17 Aug 2016 00:18:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 491E3DFF8D; Wed, 17 Aug 2016 00:18:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Wed, 17 Aug 2016 00:18:36 -0000 Message-Id: In-Reply-To: <28419dd297844777a8fa936c785895a8@git.apache.org> References: <28419dd297844777a8fa936c785895a8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/10] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Wed, 17 Aug 2016 00:18:31 -0000 Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5e53631b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e53631b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e53631b Branch: refs/heads/1.8 Commit: 5e53631b2bb5cc9f85de728d7217fe495dfe4fdd Parents: 711b421 7eb4a09 Author: Christopher Tubbs Authored: Tue Aug 16 20:17:48 2016 -0400 Committer: Christopher Tubbs Committed: Tue Aug 16 20:17:48 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/server/fs/VolumeManagerImpl.java | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5e53631b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java ----------------------------------------------------------------------