Author: vinodkv
Date: Tue Feb 28 02:39:42 2012
New Revision: 1294447
URL: http://svn.apache.org/viewvc?rev=1294447&view=rev
Log:
MAPREDUCE-3922. Fixed build to not compile 32bit container-executor binary by
default on all platforms. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1294446 ../../trunk
Modified:
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
Modified:
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/CHANGES.txt?rev=1294447&r1=1294446&r2=1294447&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/CHANGES.txt
Tue Feb 28 02:39:42 2012
@@ -82,6 +82,9 @@ Release 0.23.2 - UNRELEASED
MAPREDUCE-3913. RM application webpage is unresponsive after 2000 jobs
(Jason Lowe via tgraves)
+ MAPREDUCE-3922. Fixed build to not compile 32bit container-executor binary
+ by default on all platforms. (Hitesh Shah via vinodkv)
+
Release 0.23.1 - 2012-02-17
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml?rev=1294447&r1=1294446&r2=1294447&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
(original)
+++
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
Tue Feb 28 02:39:42 2012
@@ -28,6 +28,7 @@
<!-- Basedir eeded for generating FindBugs warnings using parent pom -->
<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
<container-executor.conf.dir>/etc/hadoop</container-executor.conf.dir>
+
<container-executor.additional_cflags></container-executor.additional_cflags>
</properties>
<dependencies>
@@ -74,7 +75,7 @@
<configureEnvironment>
<property>
<name>CFLAGS</name>
- <value>-DHADOOP_CONF_DIR=${container-executor.conf.dir}
-m32</value>
+ <value>-DHADOOP_CONF_DIR=${container-executor.conf.dir}
${container-executor.additional_cflags}</value>
</property>
</configureEnvironment>
<configureWorkDir>${project.build.directory}/native/container-executor</configureWorkDir>
