From commits-return-6162-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Fri Mar 2 23:13:07 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id B629F18062F for ; Fri, 2 Mar 2018 23:13:06 +0100 (CET) Received: (qmail 74498 invoked by uid 500); 2 Mar 2018 22:13:05 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 74483 invoked by uid 99); 2 Mar 2018 22:13:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2018 22:13:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B2C80E38C5; Fri, 2 Mar 2018 22:13:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: afine@apache.org To: commits@zookeeper.apache.org Message-Id: <96ff0b520eac40e79a5ead8a58f9587b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: zookeeper git commit: ZOOKEEPER-2936: Removed duplicate code Date: Fri, 2 Mar 2018 22:13:05 +0000 (UTC) Repository: zookeeper Updated Branches: refs/heads/branch-3.4 e0af6ed75 -> e754927db ZOOKEEPER-2936: Removed duplicate code Author: asutosh936 Reviewers: Andor Molnár , Abraham Fine Closes #473 from asutosh936/master and squashes the following commits: 6a17613be [asutosh936] ZOOKEEPER-2936 - Deleted duplicate code a02ef3db8 [asutosh936] ZOOKEEPER-2936 - Removed duplicate code (cherry picked from commit ecb1162ec7f381963fb3263c7971a85fc35b27c8) Signed-off-by: Abraham Fine Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/e754927d Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/e754927d Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/e754927d Branch: refs/heads/branch-3.4 Commit: e754927db6ca9c7a0d8bc426d393759c55ca8b96 Parents: e0af6ed Author: asutosh936 Authored: Fri Mar 2 14:12:17 2018 -0800 Committer: Abraham Fine Committed: Fri Mar 2 14:12:57 2018 -0800 ---------------------------------------------------------------------- src/contrib/rest/conf/log4j.properties | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zookeeper/blob/e754927d/src/contrib/rest/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/src/contrib/rest/conf/log4j.properties b/src/contrib/rest/conf/log4j.properties index c294b3d..21ba7e4 100644 --- a/src/contrib/rest/conf/log4j.properties +++ b/src/contrib/rest/conf/log4j.properties @@ -56,10 +56,6 @@ log4j.appender.ROLLINGFILE.MaxFileSize=10MB # uncomment the next line to limit number of backup files #log4j.appender.ROLLINGFILE.MaxBackupIndex=10 -log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout -log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n - - # # Add TRACEFILE to rootLogger to get log file output # Log DEBUG level and above messages to a log file