Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 14641200B44 for ; Thu, 9 Jun 2016 02:41:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 11796160A35; Thu, 9 Jun 2016 00:41:40 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 49560160A58 for ; Thu, 9 Jun 2016 02:41:39 +0200 (CEST) Received: (qmail 92968 invoked by uid 500); 9 Jun 2016 00:41:38 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 92842 invoked by uid 99); 9 Jun 2016 00:41:38 -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; Thu, 09 Jun 2016 00:41:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 40D32E1777; Thu, 9 Jun 2016 00:41:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Thu, 09 Jun 2016 00:41:43 -0000 Message-Id: <3ce0b2ab3ade46a7bcfb9de2cd789a85@git.apache.org> In-Reply-To: <774fc9c10df848a388ecd5b618afa7f3@git.apache.org> References: <774fc9c10df848a388ecd5b618afa7f3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/10] accumulo git commit: Merge branch '1.6' into 1.7 archived-at: Thu, 09 Jun 2016 00:41:40 -0000 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.7 Commit: e7436958fcbe6287d7ca3f4754de8acd93df9a0f Parents: 5f02d56 6cf5feb Author: Christopher Tubbs Authored: Wed Jun 8 20:39:31 2016 -0400 Committer: Christopher Tubbs 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