ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject ambari git commit: AMBARI-8222. Correct hostname:port regex should be used for timeline server properties to replace hostname. (jaimin)
Date Sat, 08 Nov 2014 00:50:34 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 5ce5d2c85 -> aee3b9db9


AMBARI-8222. Correct hostname:port regex should be used for timeline server properties to
replace hostname. (jaimin)


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

Branch: refs/heads/branch-1.7.0
Commit: aee3b9db9896c2e4ba44c3f15ba063d8b5097447
Parents: 5ce5d2c
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Fri Nov 7 16:49:28 2014 -0800
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Fri Nov 7 16:49:49 2014 -0800

----------------------------------------------------------------------
 ambari-web/app/models/service_config.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/aee3b9db/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index bc0a1c3..b338491 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -388,20 +388,20 @@ App.ServiceConfigProperty = Ember.Object.extend({
         break;
       case 'yarn.timeline-service.webapp.address':
         var atsHost =  masterComponentHostsInDB.findProperty('component', 'APP_TIMELINE_SERVER');
-        if (atsHost) {
-          this.setDefaultValue("(0.0.0.0)(?=:)", atsHost.hostName);
+        if (atsHost && atsHost.hostName) {
+          this.setDefaultValue(hostWithPort,atsHost.hostName);
         }
         break;
       case 'yarn.timeline-service.webapp.https.address':
         var atsHost =  masterComponentHostsInDB.findProperty('component', 'APP_TIMELINE_SERVER');
-        if (atsHost) {
-          this.setDefaultValue("(0.0.0.0)(?=:)", atsHost.hostName);
+        if (atsHost && atsHost.hostName) {
+          this.setDefaultValue(hostWithPort,atsHost.hostName);
         }
         break;
       case 'yarn.timeline-service.address':
         var atsHost =  masterComponentHostsInDB.findProperty('component', 'APP_TIMELINE_SERVER');
-        if (atsHost) {
-          this.setDefaultValue("(0.0.0.0)(?=:)", atsHost.hostName);
+        if (atsHost && atsHost.hostName) {
+          this.setDefaultValue(hostWithPort,atsHost.hostName);
         }
         break;
       case 'nm_hosts':


Mime
View raw message