Repository: zookeeper
Updated Branches:
  refs/heads/branch-3.4 e0af6ed75 -> e754927db


ZOOKEEPER-2936: Removed duplicate code

Author: asutosh936 <asutosh.pan...@hotmail.com>

Reviewers: Andor Molnár <an...@cloudera.com>, Abraham Fine <af...@apache.org>

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 <af...@apache.org>


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 <asutosh.pan...@hotmail.com>
Authored: Fri Mar 2 14:12:17 2018 -0800
Committer: Abraham Fine <af...@apache.org>
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

Reply via email to