Merge -r 1209812:1209813 from trunk to branch. FIXES: HADOOP-3500

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209815 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alejandro Abdelnur 2011-12-03 01:09:13 +00:00
parent c4e06b5aac
commit 89d89cb731
2 changed files with 3 additions and 2 deletions

View File

@ -183,6 +183,8 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3479. JobClient#getJob cannot find local jobs. (tomwhite) MAPREDUCE-3479. JobClient#getJob cannot find local jobs. (tomwhite)
MAPREDUCE-3500. MRJobConfig creates an LD_LIBRARY_PATH using the platform ARCH. (tucu)
Release 0.23.0 - 2011-11-01 Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -17,7 +17,6 @@
*/ */
package org.apache.hadoop.mapreduce; package org.apache.hadoop.mapreduce;
import org.apache.hadoop.util.PlatformName;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.classification.InterfaceStability;
@ -439,7 +438,7 @@ public interface MRJobConfig {
"mapreduce.admin.user.env"; "mapreduce.admin.user.env";
public static final String DEFAULT_MAPRED_ADMIN_USER_ENV = public static final String DEFAULT_MAPRED_ADMIN_USER_ENV =
"LD_LIBRARY_PATH=$HADOOP_COMMON_HOME/lib/native/" + PlatformName.getPlatformName(); "LD_LIBRARY_PATH=$HADOOP_COMMON_HOME/lib/native";
public static final String WORKDIR = "work"; public static final String WORKDIR = "work";