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 1A9BC11800 for ; Sat, 17 May 2014 02:01:42 +0000 (UTC) Received: (qmail 43986 invoked by uid 500); 17 May 2014 01:41:59 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 43893 invoked by uid 500); 17 May 2014 01:41:59 -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 43752 invoked by uid 99); 17 May 2014 01:41:07 -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, 17 May 2014 01:41:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DC67792BBAF; Sat, 17 May 2014 01:31:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: busbey@apache.org To: commits@accumulo.apache.org Date: Sat, 17 May 2014 01:31:07 -0000 Message-Id: In-Reply-To: <80993e6beb754d988444bd3f4ae260e8@git.apache.org> References: <80993e6beb754d988444bd3f4ae260e8@git.apache.org> 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/b510b766 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b510b766 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b510b766 Branch: refs/heads/master Commit: b510b766b5974cc1c55043b25bd6037d933413bb Parents: 6b36d53 244c1ab Author: Sean Busbey Authored: Fri May 16 20:38:41 2014 -0400 Committer: Sean Busbey Committed: Fri May 16 20:38:41 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/tserver/log/DfsLogger.java | 4 ++-- .../accumulo/tserver/logger/LogFileKey.java | 3 +++ .../tserver/log/LocalWALRecoveryTest.java | 22 ++++++-------------- 3 files changed, 11 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b510b766/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java ----------------------------------------------------------------------