accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Mon, 15 Sep 2014 21:32:30 GMT
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	test/src/test/resources/log4j.properties


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0c45fae3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c45fae3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c45fae3

Branch: refs/heads/master
Commit: 0c45fae3a99cb645594f40dba24e59241a553d1a
Parents: bc2862d 4556ec4
Author: Josh Elser <elserj@apache.org>
Authored: Mon Sep 15 17:31:57 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Sep 15 17:31:57 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/util/SslConnectionParams.java  | 4 ++--
 test/src/test/resources/log4j.properties                         | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c45fae3/test/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --cc test/src/test/resources/log4j.properties
index 10e2320,6d0a56c..cb35840
--- a/test/src/test/resources/log4j.properties
+++ b/test/src/test/resources/log4j.properties
@@@ -29,16 -28,8 +29,17 @@@ 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.ClientCnxn=ERROR
 +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.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


Mime
View raw message