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 58E141150E for ; Sun, 11 May 2014 11:05:02 +0000 (UTC) Received: (qmail 22119 invoked by uid 500); 10 May 2014 21:59:37 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 84986 invoked by uid 500); 10 May 2014 21:57:27 -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 57752 invoked by uid 99); 10 May 2014 21:56:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 May 2014 21:56:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C4337988C85; Fri, 9 May 2014 15:28:39 +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, 09 May 2014 15:28:51 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [13/50] [abbrv] git commit: Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' into 1.6.1-SNAPSHOT Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' into 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/4d5ba9da Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d5ba9da Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4d5ba9da Branch: refs/heads/ACCUMULO-378 Commit: 4d5ba9daf0eedbd14df0e8d49a0fd3e38a8fa48f Parents: 18c0e8e 1c38957 Author: Christopher Tubbs Authored: Fri May 2 18:18:34 2014 -0400 Committer: Christopher Tubbs Committed: Fri May 2 18:18:34 2014 -0400 ---------------------------------------------------------------------- pom.xml | 3 ++ .../test/functional/HalfDeadTServerIT.java | 15 +++--- .../accumulo/test/randomwalk/FrameworkTest.java | 48 ++++++++++---------- 3 files changed, 36 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d5ba9da/pom.xml ----------------------------------------------------------------------