From 0e9f40df97a6ca10e5f2ebd8e85f70f9bbd78612 Mon Sep 17 00:00:00 2001 From: Robert Joseph Evans Date: Tue, 16 Oct 2012 22:00:03 +0000 Subject: [PATCH] MAPREDUCE-4521. mapreduce.user.classpath.first incompatibility with 0.20/1.x (Ravi Prakash via bobby) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1399011 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index d6d8e74392..2066dad892 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -576,6 +576,9 @@ Release 0.23.5 - UNRELEASED inaccessible despite the presence of a valid history file. (Jason Lowe via sseth) + MAPREDUCE-4521. mapreduce.user.classpath.first incompatibility with 0.20/1.x + (Ravi Prakash via bobby) + Release 0.23.4 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java index 22f5a1caba..ce4f0066fa 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java @@ -519,6 +519,8 @@ private static void addDeprecatedKeys() { new String[] { MRJobConfig.MR_AM_SECURITY_SERVICE_AUTHORIZATION_CLIENT }); + Configuration.addDeprecation("mapreduce.user.classpath.first", + MRJobConfig.MAPREDUCE_JOB_USER_CLASSPATH_FIRST); } public static void main(String[] args) {