Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 69ED911F0E for ; Fri, 4 Jul 2014 04:32:58 +0000 (UTC) Received: (qmail 18488 invoked by uid 500); 4 Jul 2014 04:32:58 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 18381 invoked by uid 500); 4 Jul 2014 04:32: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 18286 invoked by uid 99); 4 Jul 2014 04:32:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2014 04:32:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D5632999F26; Fri, 4 Jul 2014 04:32:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Fri, 04 Jul 2014 04:32:59 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch '1.6.1-SNAPSHOT' Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7e81971f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7e81971f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7e81971f Branch: refs/heads/master Commit: 7e81971f4dba083c13715648d66cd2f40a5c8886 Parents: 996441f 5eceb10 Author: Josh Elser Authored: Fri Jul 4 00:20:19 2014 -0400 Committer: Josh Elser Committed: Fri Jul 4 00:20:19 2014 -0400 ---------------------------------------------------------------------- .../accumulo/server/fs/VolumeManagerImpl.java | 26 +++++- .../server/fs/VolumeManagerImplTest.java | 85 ++++++++++++++++++++ .../accumulo/master/TabletGroupWatcher.java | 6 +- 3 files changed, 114 insertions(+), 3 deletions(-) ----------------------------------------------------------------------