You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/09/16 18:56:48 UTC
[1/2] ambari git commit: AMBARI-13118. Add service wizard: js error
on review page, that makes impossible to finish this wiz (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 9cd683d64 -> b2a83e0fa
AMBARI-13118. Add service wizard: js error on review page, that makes impossible to finish this wiz (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b2a83e0f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b2a83e0f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b2a83e0f
Branch: refs/heads/branch-2.1
Commit: b2a83e0fa1d24f0e152b56a24e9448a63b643006
Parents: 484e361
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Sep 16 19:45:41 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed Sep 16 19:56:40 2015 +0300
----------------------------------------------------------------------
ambari-web/app/utils/configs/config_property_helper.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b2a83e0f/ambari-web/app/utils/configs/config_property_helper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/configs/config_property_helper.js b/ambari-web/app/utils/configs/config_property_helper.js
index 3133165..c2d978f 100644
--- a/ambari-web/app/utils/configs/config_property_helper.js
+++ b/ambari-web/app/utils/configs/config_property_helper.js
@@ -162,7 +162,7 @@ module.exports = {
}
break;
case 'oozie_hostname':
- configProperty.set('recommendedValue', masterComponentHostsInDB.filterProperty('component', 'OOZIE_SERVER').mapProperty('hostName'));
+ configProperty.set('recommendedValue', masterComponentHostsInDB.filterProperty('component', 'OOZIE_SERVER').mapProperty('hostName')[0]);
case 'oozieserver_host':
configProperty.set('value', masterComponentHostsInDB.filterProperty('component', 'OOZIE_SERVER').mapProperty('hostName'));
break;
[2/2] ambari git commit: AMBARI-13117. “Oozie-HA Quick links" in Ambari points to incorrect URL after enabling SSL (alexantonenko)
Posted by al...@apache.org.
AMBARI-13117. “Oozie-HA Quick links" in Ambari points to incorrect URL after enabling SSL (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/484e3610
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/484e3610
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/484e3610
Branch: refs/heads/branch-2.1
Commit: 484e361078a1a854af854d6580fe2beff582be21
Parents: 9cd683d
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Sep 16 19:39:37 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed Sep 16 19:56:40 2015 +0300
----------------------------------------------------------------------
ambari-web/app/views/common/quick_view_link_view.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/484e3610/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 500d6ec..8fe5d0c 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -162,7 +162,7 @@ App.QuickViewLinks = Em.View.extend({
var quickLinks = [];
self.get('content.quickLinks').forEach(function (item) {
var newItem = {};
- var protocol = self.setProtocol(item.get('service_id'), self.get('configProperties'), self.ambariProperties());
+ var protocol = self.setProtocol(item.get('service_id'), self.get('configProperties'), self.ambariProperties(), item);
if (item.get('template')) {
var port;
var hostNameRegExp = new RegExp('([\\w\\W]*):\\d+');