Repository: hadoop
Updated Branches:
  refs/heads/trunk 276485e1d -> e1990ab42


MAPREDUCE-6186. Redundant call to requireJob() while displaying the conf page. 
Contributed by Rohit Agarwal


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e1990ab4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e1990ab4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e1990ab4

Branch: refs/heads/trunk
Commit: e1990ab4275b9092cae3573334791f7b2f8df7e5
Parents: 276485e
Author: Jason Lowe <[email protected]>
Authored: Thu Feb 5 20:13:31 2015 +0000
Committer: Jason Lowe <[email protected]>
Committed: Thu Feb 5 20:13:31 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/e1990ab4/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 06da408..3a56891 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -338,6 +338,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/e1990ab4/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();
     }

Reply via email to