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 1448F10578 for ; Tue, 18 Feb 2014 20:08:35 +0000 (UTC) Received: (qmail 5663 invoked by uid 500); 18 Feb 2014 20:08:30 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 5491 invoked by uid 500); 18 Feb 2014 20:08:26 -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 5283 invoked by uid 99); 18 Feb 2014 20:08:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Feb 2014 20:08:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2D26A92AE93; Tue, 18 Feb 2014 20:08:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Tue, 18 Feb 2014 20:08:27 -0000 Message-Id: In-Reply-To: <064cfe9ff01a4d13ba9327861b029e2f@git.apache.org> References: <064cfe9ff01a4d13ba9327861b029e2f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/91eb87c4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/91eb87c4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/91eb87c4 Branch: refs/heads/master Commit: 91eb87c4891f7b04cb8777a171a4d9654463f1ee Parents: dd7e593 6c91e34 Author: Eric Newton Authored: Tue Feb 18 15:07:56 2014 -0500 Committer: Eric Newton Committed: Tue Feb 18 15:07:56 2014 -0500 ---------------------------------------------------------------------- .../accumulo/test/DeleteTableDuringSplitIT.java | 125 ------------------- .../functional/DeleteTableDuringSplitIT.java | 86 +++++++++++++ 2 files changed, 86 insertions(+), 125 deletions(-) ----------------------------------------------------------------------