Updated Branches: refs/heads/master cde5f34e7 -> 54efa1d6c
CRUNCH-270: Removed packaged log4j.properties files Signed-off-by: Micah Whitacre <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/54efa1d6 Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/54efa1d6 Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/54efa1d6 Branch: refs/heads/master Commit: 54efa1d6c87078bb8277c12701989a60659b1da7 Parents: cde5f34 Author: Micah Whitacre <[email protected]> Authored: Sun Oct 27 20:44:31 2013 -0500 Committer: Micah Whitacre <[email protected]> Committed: Tue Oct 29 21:24:36 2013 -0500 ---------------------------------------------------------------------- crunch-core/src/main/resources/log4j.properties | 24 -------------------- crunch-scrunch/src/main/conf/log4j.properties | 24 -------------------- 2 files changed, 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/crunch/blob/54efa1d6/crunch-core/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/crunch-core/src/main/resources/log4j.properties b/crunch-core/src/main/resources/log4j.properties deleted file mode 100644 index 506b527..0000000 --- a/crunch-core/src/main/resources/log4j.properties +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# ***** Set root logger level to INFO and its only appender to A. -log4j.logger.org.apache.crunch=info, A - -# ***** A is set to be a ConsoleAppender. -log4j.appender.A=org.apache.log4j.ConsoleAppender -# ***** A uses PatternLayout. -log4j.appender.A.layout=org.apache.log4j.PatternLayout -log4j.appender.A.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n http://git-wip-us.apache.org/repos/asf/crunch/blob/54efa1d6/crunch-scrunch/src/main/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/crunch-scrunch/src/main/conf/log4j.properties b/crunch-scrunch/src/main/conf/log4j.properties deleted file mode 100644 index c0aa96a..0000000 --- a/crunch-scrunch/src/main/conf/log4j.properties +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# ***** Set root logger level to INFO and its only appender to A. -log4j.logger.org.apache.crunch.scrunch=info, A - -# ***** A is set to be a ConsoleAppender. -log4j.appender.A=org.apache.log4j.ConsoleAppender -# ***** A uses PatternLayout. -log4j.appender.A.layout=org.apache.log4j.PatternLayout -log4j.appender.A.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
