From 89d89cb7310daf5227f9b4f00685715d32f64d53 Mon Sep 17 00:00:00 2001 From: Alejandro Abdelnur Date: Sat, 3 Dec 2011 01:09:13 +0000 Subject: [PATCH] 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 --- hadoop-mapreduce-project/CHANGES.txt | 2 ++ .../src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 587d5439598..e1723dc7996 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -183,6 +183,8 @@ Release 0.23.1 - Unreleased 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 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java index 769d842c607..dd189e2eafa 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java @@ -17,7 +17,6 @@ */ package org.apache.hadoop.mapreduce; -import org.apache.hadoop.util.PlatformName; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; @@ -439,7 +438,7 @@ public interface MRJobConfig { "mapreduce.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";