Repository: hadoop Updated Branches: refs/heads/branch-2 cbb885836 -> 5e403e8b8
MAPREDUCE-6100. replace mapreduce.job.credentials.binary with MRJobConfig.MAPREDUCE_JOB_CREDENTIALS_BINARY for better readability. Contributed by Zhihai Xu. (cherry picked from commit f222bde273cc10a38945dc31e85206a0c4f06a12) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5e403e8b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5e403e8b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5e403e8b Branch: refs/heads/branch-2 Commit: 5e403e8b8d16640699428ead8e5e9f343bc45c10 Parents: cbb8858 Author: Harsh J <[email protected]> Authored: Tue Mar 17 11:06:35 2015 +0530 Committer: Harsh J <[email protected]> Committed: Tue Mar 17 11:08:32 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/5e403e8b/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index c0c6d57..c8aa10a 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -8,6 +8,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/5e403e8b/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(
