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 Thu, 21 Aug 2014 20:27:14 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/c884c825
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c884c825
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c884c825

Branch: refs/heads/master
Commit: c884c825944d33d3dad067318b4fa4846bbf7ab8
Parents: b223488 b47c86d
Author: Josh Elser <elserj@apache.org>
Authored: Thu Aug 21 16:26:55 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Aug 21 16:26:55 2014 -0400

----------------------------------------------------------------------
 .../test/functional/CreateAndUseIT.java         | 62 +++++++++-----------
 test/src/test/resources/log4j.properties        |  2 +-
 2 files changed, 29 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c884c825/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
index a91c17c,c1225b3..e31f4b9
--- a/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
@@@ -16,8 -16,8 +16,9 @@@
   */
  package org.apache.accumulo.test.functional;
  
 +import java.nio.charset.StandardCharsets;
  import java.util.ArrayList;
+ import java.util.Iterator;
  import java.util.Map.Entry;
  import java.util.SortedSet;
  import java.util.TreeSet;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c884c825/test/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --cc test/src/test/resources/log4j.properties
index a960c35,67deacd..d8beb4b
--- a/test/src/test/resources/log4j.properties
+++ b/test/src/test/resources/log4j.properties
@@@ -29,15 -28,7 +29,15 @@@ 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.ZooKeeper=WARN
 +log4j.logger.org.apache.zookeeper.ClientCnxn=FATAL
 +log4j.logger.org.apache.zookeeper.ZooKeeper=WARN
  log4j.logger.org.apache.accumulo.core.file.rfile.bcfile=INFO
 -log4j.logger.org.apache.accumulo.core.client.impl.ThriftScanner=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.BlockStateChange=WARN


Mime
View raw message