tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject tez git commit: TEZ-2960. Tez UI: Move hardcoded url namespace to the configuration file (sree)
Date Wed, 02 Dec 2015 05:56:29 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.7 72e675a47 -> 0a1a29b15


TEZ-2960. Tez UI: Move hardcoded url namespace to the configuration file (sree)

(cherry picked from commit 9dce5101170893066d788e8a1a96bbc8672dc5b9)


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

Branch: refs/heads/branch-0.7
Commit: 0a1a29b1534853b722740aadc95fe1313e65d088
Parents: 72e675a
Author: Sreenath Somarajapuram <sree@apache.org>
Authored: Wed Dec 2 11:22:33 2015 +0530
Committer: Sreenath Somarajapuram <sree@apache.org>
Committed: Wed Dec 2 11:25:28 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                      | 1 +
 .../webapp/app/scripts/controllers/tez-app-index-controller.js   | 2 +-
 tez-ui/src/main/webapp/app/scripts/default-configs.js            | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/0a1a29b1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9b10831..80df681 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@ INCOMPATIBLE CHANGES
   TEZ-2949. Allow duplicate dag names within session for Tez.
 
 ALL CHANGES
+  TEZ-2960. Tez UI: Move hardcoded url namespace to the configuration file
   TEZ-2947. Tez UI: Timeline, RM & AM requests gets into a consecutive loop in counters
page without any delay
   TEZ-2946. Tez UI: At times RM return a huge error message making the yellow error bar to
fill the whole screen
   TEZ-2949. Allow duplicate dag names within session for Tez.

http://git-wip-us.apache.org/repos/asf/tez/blob/0a1a29b1/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-index-controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-index-controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-index-controller.js
index a4dc372..ae1df85 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-index-controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-index-controller.js
@@ -22,7 +22,7 @@ App.TezAppIndexController = App.PollingController.extend(App.ModelRefreshMixin,
   controllerName: 'TezAppIndexController',
 
   rmTrackingURL: function() {
-    return App.env.RMWebUrl + '/cluster/app/' + this.get('appId');
+    return "%@/%@/app/%@".fmt(App.env.RMWebUrl, App.Configs.otherNamespace.cluster, this.get('appId'));
   }.property('appId'),
 
   load: function () {

http://git-wip-us.apache.org/repos/asf/tez/blob/0a1a29b1/tez-ui/src/main/webapp/app/scripts/default-configs.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/default-configs.js b/tez-ui/src/main/webapp/app/scripts/default-configs.js
index 93556aa..dbdf707 100644
--- a/tez-ui/src/main/webapp/app/scripts/default-configs.js
+++ b/tez-ui/src/main/webapp/app/scripts/default-configs.js
@@ -53,6 +53,10 @@ $.extend(true, App.Configs, {
     cluster: 'ws/v1/cluster'
   },
 
+  otherNamespace: {
+    cluster: 'cluster',
+  },
+
   tables: {
     entity: {
       dag: [


Mime
View raw message