| commit | 55df52111266fd104790dde351465d34c601a72a | [log] [tgz] |
|---|---|---|
| author | buyingyi <buyingyi@123451ca-8445-de46-9d55-352943316053> | Sun Mar 24 07:20:08 2013 +0000 |
| committer | buyingyi <buyingyi@123451ca-8445-de46-9d55-352943316053> | Sun Mar 24 07:20:08 2013 +0000 |
| tree | 3f935c760e925c1860faa1d6c1a4f07514980646 | |
| parent | 70c821ca37449f5665274d6b10ec57caaa48ed9b [diff] |
cross merge fullstack_release_candidate into trunk git-svn-id: https://hyracks.googlecode.com/svn/trunk/fullstack@3208 123451ca-8445-de46-9d55-352943316053
diff --git a/pregelix/pregelix-example/src/test/resources/hadoop/conf/log4j.properties b/pregelix/pregelix-example/src/test/resources/hadoop/conf/log4j.properties index d5e6004..3335964 100755 --- a/pregelix/pregelix-example/src/test/resources/hadoop/conf/log4j.properties +++ b/pregelix/pregelix-example/src/test/resources/hadoop/conf/log4j.properties
@@ -76,7 +76,7 @@ # FSNamesystem Audit logging # All audit events are logged at INFO level # -log4j.logger.org.apache.hadoop.fs.FSNamesystem.audit=WARN +log4j.logger.org.apache.hadoop=FATAL # Custom Logging levels
diff --git a/pregelix/pregelix-example/src/test/resources/hadoop/conf/mapred-site.xml b/pregelix/pregelix-example/src/test/resources/hadoop/conf/mapred-site.xml index 1b9a4d6..71450f1 100644 --- a/pregelix/pregelix-example/src/test/resources/hadoop/conf/mapred-site.xml +++ b/pregelix/pregelix-example/src/test/resources/hadoop/conf/mapred-site.xml
@@ -18,8 +18,8 @@ <value>20</value> </property> <property> - <name>mapred.min.split.size</name> - <value>65536</value> + <name>mapred.max.split.size</name> + <value>128</value> </property> </configuration>