You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zj...@apache.org on 2015/05/12 22:49:27 UTC
[10/36] hadoop git commit: MAPREDUCE-6359. In RM HA setup,
Cluster tab links populated with AM hostname instead of RM.
Contributed by zhaoyunjiong.
MAPREDUCE-6359. In RM HA setup, Cluster tab links populated with AM hostname instead of RM. Contributed by zhaoyunjiong.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/33ae623b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/33ae623b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/33ae623b
Branch: refs/heads/YARN-2928
Commit: 33ae623bc8d7421dcb29902cae52a90c1d4e8a95
Parents: c44b307
Author: Junping Du <ju...@apache.org>
Authored: Sat May 9 06:11:13 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Tue May 12 13:24:11 2015 -0700
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/33ae623b/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 3aed17d..ea1a148 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -420,6 +420,9 @@ Release 2.8.0 - UNRELEASED
MAPREDUCE-4750. Enable NNBenchWithoutMR in MapredTestDriver (Liang Xie
and Jason Lowe via raviprak)
+ MAPREDUCE-6359. In RM HA setup, "Cluster" tab links populated with AM
+ hostname instead of RM. (zhaoyunjiong via junping_du)
+
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/33ae623b/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 0f528e4..305ec7e 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
@@ -62,7 +62,7 @@ public class AppController extends Controller implements AMParams {
set(APP_ID, app.context.getApplicationID().toString());
set(RM_WEB,
JOINER.join(MRWebAppUtil.getYARNWebappScheme(),
- WebAppUtils.getResolvedRMWebAppURLWithoutScheme(conf,
+ WebAppUtils.getResolvedRemoteRMWebAppURLWithoutScheme(conf,
MRWebAppUtil.getYARNHttpPolicy())));
}