| commit | 06c4aaf56af08f8920f4709e8a3689933db9b662 | [log] [tgz] |
|---|---|---|
| author | Arun Murthy <acmurthy@apache.org> | Sat Feb 18 06:37:35 2012 +0000 |
| committer | Arun Murthy <acmurthy@apache.org> | Sat Feb 18 06:37:35 2012 +0000 |
| tree | 31c69a39c6563d4bfe88fed70e48c38a00dd0c90 | |
| parent | 9d5b8e3114786398dafec3c17091e9fd3ae83d63 [diff] |
Merge -c 1245867 from trunk to branch-0.23.1 to fix MAPREDUCE-3880. Changed LCE binary to be 32-bit. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.1@1245869 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 05f3247..9e68ef7 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -757,6 +757,8 @@ urls when mutiple jobs are submitted from same client jvm. (Eric Payne via sseth) + MAPREDUCE-3880. Changed LCE binary to be 32-bit. (acmurthy) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml index df395b3..575d114 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
@@ -74,7 +74,7 @@ <configureEnvironment> <property> <name>CFLAGS</name> - <value>-DHADOOP_CONF_DIR=${container-executor.conf.dir}</value> + <value>-DHADOOP_CONF_DIR=${container-executor.conf.dir} -m32</value> </property> </configureEnvironment> <configureWorkDir>${project.build.directory}/native/container-executor</configureWorkDir>