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 3492710D1A for ; Fri, 16 May 2014 13:45:41 +0000 (UTC) Received: (qmail 23199 invoked by uid 500); 16 May 2014 10:16:42 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 16828 invoked by uid 500); 16 May 2014 10:16:17 -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 13809 invoked by uid 99); 16 May 2014 10:16:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 May 2014 10:16:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 69D6A91E93E; Thu, 15 May 2014 18:34:38 +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: Thu, 15 May 2014 18:34:44 -0000 Message-Id: <40806776e0aa4e2b8afa9551c6cda890@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/10] git commit: Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo 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/a16f5998 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a16f5998 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a16f5998 Branch: refs/heads/master Commit: a16f59985e7299d5e3eb5a161ecd0fff0905c94e Parents: 652253e bd3c2f0 Author: Josh Elser Authored: Thu May 15 14:14:00 2014 -0400 Committer: Josh Elser Committed: Thu May 15 14:14:00 2014 -0400 ---------------------------------------------------------------------- server/gc/src/test/resources/log4j.properties | 19 +++++++++++++++++++ .../master/src/test/resources/log4j.properties | 19 +++++++++++++++++++ .../monitor/src/test/resources/log4j.properties | 19 +++++++++++++++++++ .../tserver/src/test/resources/log4j.properties | 19 +++++++++++++++++++ 4 files changed, 76 insertions(+) ----------------------------------------------------------------------