Repository: hadoop Updated Branches: refs/heads/branch-2 ebdd88ec8 -> eb927a1d6
MAPREDUCE-6186. Redundant call to requireJob() while displaying the conf page. Contributed by Rohit Agarwal (cherry picked from commit e1990ab4275b9092cae3573334791f7b2f8df7e5) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eb927a1d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eb927a1d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eb927a1d Branch: refs/heads/branch-2 Commit: eb927a1d6b97ac3fb53029beedeeeb0e62c79e0e Parents: ebdd88e Author: Jason Lowe <[email protected]> Authored: Thu Feb 5 20:13:31 2015 +0000 Committer: Jason Lowe <[email protected]> Committed: Thu Feb 5 20:14:13 2015 +0000 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb927a1d/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 7dfa454..b68e522 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -106,6 +106,9 @@ Release 2.7.0 - UNRELEASED MAPREDUCE-5988. Fix dead links to the javadocs in mapreduce project. (aajisaka) + MAPREDUCE-6186. Redundant call to requireJob() while displaying the conf + page (Rohit Agarwal via jlowe) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb927a1d/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java index d7929cc..53f21db 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java @@ -313,7 +313,6 @@ public class AppController extends Controller implements AMParams { * Render the /conf page */ public void conf() { - requireJob(); try { requireJob(); }
