You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2014/02/27 02:39:14 UTC
git commit: AMBARI-4861: Falcon Quick link doesn't work with port
customization. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 4635717ad -> f0a9aaa62
AMBARI-4861: Falcon Quick link doesn't work with port customization. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f0a9aaa6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f0a9aaa6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f0a9aaa6
Branch: refs/heads/trunk
Commit: f0a9aaa62f37f8a63f7314a850b1d6ea23fc2000
Parents: 4635717
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Wed Feb 26 17:38:53 2014 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Wed Feb 26 17:38:53 2014 -0800
----------------------------------------------------------------------
ambari-web/app/models/quick_links.js | 7 +++----
ambari-web/app/views/common/quick_view_link_view.js | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0a9aaa6/ambari-web/app/models/quick_links.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/quick_links.js b/ambari-web/app/models/quick_links.js
index 318de08..55dbc14 100644
--- a/ambari-web/app/models/quick_links.js
+++ b/ambari-web/app/models/quick_links.js
@@ -407,10 +407,9 @@ App.QuickLinks.FIXTURES = [
url:'%@://%@:%@/',
service_id: 'FALCON',
template:'%@://%@:%@/',
- http_config: 'falconserver.host',
- https_config: 'falconserver.host',
- site: 'oozie-site',
- regex: portRegex,
+ http_config: 'falcon_port',
+ site: 'global',
+ regex: '^(\\d+)$',
default_http_port: 15000
}
];
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0a9aaa6/ambari-web/app/views/common/quick_view_link_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/quick_view_link_view.js b/ambari-web/app/views/common/quick_view_link_view.js
index 9afe730..a39e804 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -49,7 +49,7 @@ App.QuickViewLinks = Em.View.extend({
/**
* list of files that contains properties for enabling/disabling ssl
*/
- requiredSiteNames: ['core-site', 'hdfs-site', 'hbase-site', 'oozie-site', 'yarn-site', 'mapred-site'],
+ requiredSiteNames: ['global','core-site', 'hdfs-site', 'hbase-site', 'oozie-site', 'yarn-site', 'mapred-site'],
setConfigProperties: function () {
this.set('configProperties', []);