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 44A9A10644 for ; Thu, 20 Mar 2014 18:41:36 +0000 (UTC) Received: (qmail 81152 invoked by uid 500); 20 Mar 2014 18:41:35 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 81055 invoked by uid 500); 20 Mar 2014 18:41:32 -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 80842 invoked by uid 99); 20 Mar 2014 18:41:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Mar 2014 18:41:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E8C9598697F; Thu, 20 Mar 2014 18:41:21 +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: Thu, 20 Mar 2014 18:41:23 -0000 Message-Id: <317c192aa342437197925efe72a6517b@git.apache.org> In-Reply-To: <913ecbc4cba3435181709f42c33ecdb9@git.apache.org> References: <913ecbc4cba3435181709f42c33ecdb9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch '1.6.0-SNAPSHOT' Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7988f8f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7988f8f6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7988f8f6 Branch: refs/heads/master Commit: 7988f8f6c5bd023e584382b9e92ed6d5cb112d54 Parents: fbb18d6 acce1d5 Author: Eric C. Newton Authored: Thu Mar 20 14:41:11 2014 -0400 Committer: Eric C. Newton Committed: Thu Mar 20 14:41:11 2014 -0400 ---------------------------------------------------------------------- .../accumulo/test/functional/HalfDeadTServerIT.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) ----------------------------------------------------------------------