Author: tucu
Date: Wed Feb 29 16:21:42 2012
New Revision: 1295179
URL: http://svn.apache.org/viewvc?rev=1295179&view=rev
Log:
Merge -r 1295177:1295178 from trunk to branch. FIXES: MAPREDUCE-3933
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1295179&r1=1295178&r2=1295179&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Wed
Feb 29 16:21:42 2012
@@ -35,6 +35,8 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-2942. TestNMAuditLogger.testNMAuditLoggerWithIP failing (Thomas
Graves via mahadev)
+ MAPREDUCE-3933. Failures because MALLOC_ARENA_MAX is not set (ahmed via
tucu)
+
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml?rev=1295179&r1=1295178&r2=1295179&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
Wed Feb 29 16:21:42 2012
@@ -104,7 +104,6 @@
<configuration>
<environmentVariables>
<JAVA_HOME>${java.home}</JAVA_HOME>
- <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
</environmentVariables>
</configuration>
</plugin>
