MAPREDUCE-6100. replace mapreduce.job.credentials.binary with MRJobConfig.MAPREDUCE_JOB_CREDENTIALS_BINARY for better readability. Contributed by Zhihai Xu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f222bde2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f222bde2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f222bde2 Branch: refs/heads/HDFS-7836 Commit: f222bde273cc10a38945dc31e85206a0c4f06a12 Parents: 046521c Author: Harsh J <ha...@cloudera.com> Authored: Tue Mar 17 11:06:35 2015 +0530 Committer: Harsh J <ha...@cloudera.com> Committed: Tue Mar 17 11:06:35 2015 +0530 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 4 ++++ .../src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f222bde2/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 52880f6..ee21b70 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -253,6 +253,10 @@ Release 2.8.0 - UNRELEASED IMPROVEMENTS + MAPREDUCE-6100. replace "mapreduce.job.credentials.binary" with + MRJobConfig.MAPREDUCE_JOB_CREDENTIALS_BINARY for better readability. + (Zhihai Xu via harsh) + MAPREDUCE-6105. Inconsistent configuration in property mapreduce.reduce.shuffle.merge.percent. (Ray Chiang via harsh) http://git-wip-us.apache.org/repos/asf/hadoop/blob/f222bde2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java index 30a87c7..023bd63 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java @@ -383,7 +383,7 @@ class JobSubmitter { throws IOException { // add tokens and secrets coming from a token storage file String binaryTokenFilename = - conf.get("mapreduce.job.credentials.binary"); + conf.get(MRJobConfig.MAPREDUCE_JOB_CREDENTIALS_BINARY); if (binaryTokenFilename != null) { Credentials binary = Credentials.readTokenStorageFile( FileSystem.getLocal(conf).makeQualified(
