Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7436958 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7436958 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7436958 Branch: refs/heads/1.8 Commit: e7436958fcbe6287d7ca3f4754de8acd93df9a0f Parents: 5f02d56 6cf5feb Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Jun 8 20:39:31 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Jun 8 20:39:31 2016 -0400 ---------------------------------------------------------------------- test/src/test/resources/log4j.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7436958/test/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --cc test/src/test/resources/log4j.properties index 8ab1d7b,ade18bf..42b58c8 --- a/test/src/test/resources/log4j.properties +++ b/test/src/test/resources/log4j.properties @@@ -29,29 -28,8 +29,29 @@@ log4j.logger.org.apache.hadoop.mapred=E 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=DEBUG +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
