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 811F810629 for ; Tue, 4 Feb 2014 00:19:33 +0000 (UTC) Received: (qmail 40207 invoked by uid 500); 4 Feb 2014 00:19:25 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 40006 invoked by uid 500); 4 Feb 2014 00:19:19 -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 39876 invoked by uid 99); 4 Feb 2014 00:19:16 -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, 04 Feb 2014 00:19:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 08A41314092; Tue, 4 Feb 2014 00:19:15 +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: Tue, 04 Feb 2014 00:19:23 -0000 Message-Id: <0654cd6bb25744209e1bcbd8d1b03af4@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/16] git commit: Merge branch '1.4.5-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.4.5-SNAPSHOT Merge branch '1.4.5-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.4.5-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c5a787b6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c5a787b6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c5a787b6 Branch: refs/heads/1.4.5-SNAPSHOT Commit: c5a787b6205fb73b46c96cc53afb1114eaffa42a Parents: 6537d7a f11eb1d Author: Josh Elser Authored: Mon Feb 3 18:53:18 2014 -0500 Committer: Josh Elser Committed: Mon Feb 3 18:53:18 2014 -0500 ---------------------------------------------------------------------- bin/config.sh | 2 +- .../main/java/org/apache/accumulo/server/logger/LogWriter.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------