svn merge -c 1399011. FIXES: 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/branches/branch-2@1399012 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Joseph Evans 2012-10-16 22:00:51 +00:00
parent cad0525464
commit 0f4838ab6b
2 changed files with 5 additions and 0 deletions

View File

@ -437,6 +437,9 @@ Release 0.23.5 - UNRELEASED
inaccessible despite the presence of a valid history file. (Jason Lowe inaccessible despite the presence of a valid history file. (Jason Lowe
via sseth) via sseth)
MAPREDUCE-4521. mapreduce.user.classpath.first incompatibility with 0.20/1.x
(Ravi Prakash via bobby)
Release 0.23.4 - UNRELEASED Release 0.23.4 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -519,6 +519,8 @@ public class ConfigUtil {
new String[] { new String[] {
MRJobConfig.MR_AM_SECURITY_SERVICE_AUTHORIZATION_CLIENT 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) { public static void main(String[] args) {