Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8d954e2c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8d954e2c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8d954e2c Branch: refs/heads/master Commit: 8d954e2ca1c782601ffbce56ccc78de43a63650b Parents: eff4547 e743695 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Jun 8 20:39:40 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Jun 8 20:39:40 2016 -0400 ---------------------------------------------------------------------- test/src/main/resources/log4j.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d954e2c/test/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --cc test/src/main/resources/log4j.properties index 965c1ca,0000000..6041ee5 mode 100644,000000..100644 --- a/test/src/main/resources/log4j.properties +++ b/test/src/main/resources/log4j.properties @@@ -1,57 -1,0 +1,57 @@@ +# 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. + +log4j.rootLogger=DEBUG, CA +log4j.appender.CA=org.apache.log4j.ConsoleAppender +log4j.appender.CA.layout=org.apache.log4j.PatternLayout +log4j.appender.CA.layout.ConversionPattern=%d{ISO8601} [%c{2}] %-5p: %m%n + +log4j.logger.org.apache.accumulo.core=DEBUG +log4j.logger.org.apache.accumulo.core.client.impl.MasterClient=INFO +log4j.logger.org.apache.accumulo.core.client.impl.ServerClient=ERROR +log4j.logger.org.apache.accumulo.core.util.shell.Shell.audit=OFF +log4j.logger.org.apache.accumulo.core.util.shell.Shell=FATAL +log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN +log4j.logger.org.apache.hadoop.io.compress.CodecPool=WARN +log4j.logger.org.apache.hadoop.mapred=ERROR +log4j.logger.org.apache.hadoop.tools.DistCp=WARN +log4j.logger.org.apache.hadoop.util.NativeCodeLoader=ERROR +log4j.logger.org.apache.hadoop.util.ProcessTree=WARN ++log4j.logger.org.apache.zookeeper=INFO +log4j.logger.org.apache.zookeeper.ClientCnxn=FATAL - log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=INFO +log4j.logger.org.apache.zookeeper.ZooKeeper=WARN +log4j.logger.org.apache.accumulo.core.file.rfile.bcfile=INFO +log4j.logger.org.apache.accumulo.server.util.ReplicationTableUtil=TRACE +log4j.logger.org.apache.accumulo.core.client.impl.ThriftScanner=INFO +log4j.logger.org.apache.accumulo.fate.zookeeper.DistributedReadWriteLock=WARN +log4j.logger.org.mortbay.log=WARN +log4j.logger.org.apache.hadoop=WARN +log4j.logger.org.apache.jasper=INFO +log4j.logger.org.apache.hadoop.hdfs.server.namenode.FSNamesystem.audit=WARN +log4j.logger.org.apache.hadoop.hdfs.server.datanode.DataNode.clienttrace=WARN +log4j.logger.BlockStateChange=WARN +log4j.logger.org.apache.accumulo.core.client.impl.TabletServerBatchReaderIterator=INFO +log4j.logger.org.apache.hadoop.security=INFO +log4j.logger.org.apache.hadoop.minikdc=DEBUG +log4j.logger.org.apache.directory=INFO +log4j.logger.org.apache.directory.api.ldap=WARN +# This is really spammy at debug +log4j.logger.org.apache.thrift.transport.TSaslTransport=INFO +# From apache-ds/minikdc +log4j.logger.org.apache.mina=INFO +log4j.logger.org.apache.accumulo.server.thrift.UGIAssumingProcessor=TRACE +log4j.logger.org.apache.hadoop.security.UserGroupInformation=INFO +# For debugging replication tests. - log4j.logger.org.apache.accumulo.master.MasterDrainImpl=TRACE ++log4j.logger.org.apache.accumulo.master.MasterDrainImpl=TRACE
