Merge -c 1183188 from trunk to branch-0.23 to fix MAPREDUCE-3124.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183189 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
ea8f6cf534
commit
8876fb033f
|
@ -1565,6 +1565,9 @@ Release 0.23.0 - Unreleased
|
|||
MAPREDUCE-3170. Fixed job output commit for deep hierarchies. (Hitesh Shah
|
||||
via acmurthy)
|
||||
|
||||
MAPREDUCE-3124. Fixed location of native libs i.e. libhadoop.so for
|
||||
containers. (John George via acmurthy)
|
||||
|
||||
Release 0.22.0 - Unreleased
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
*/
|
||||
package org.apache.hadoop.mapreduce;
|
||||
|
||||
import org.apache.hadoop.util.PlatformName;
|
||||
import org.apache.hadoop.classification.InterfaceAudience;
|
||||
import org.apache.hadoop.classification.InterfaceStability;
|
||||
|
||||
|
@ -428,7 +429,7 @@ public interface MRJobConfig {
|
|||
"mapreduce.admin.user.env";
|
||||
|
||||
public static final String DEFAULT_MAPRED_ADMIN_USER_ENV =
|
||||
"LD_LIBRARY_PATH=$HADOOP_COMMON_HOME/lib";
|
||||
"LD_LIBRARY_PATH=$HADOOP_COMMON_HOME/lib/native/" + PlatformName.getPlatformName();
|
||||
|
||||
public static final String WORKDIR = "work";
|
||||
|
||||
|
|
Loading…
Reference in New Issue