You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2015/01/14 13:52:08 UTC
ambari git commit: AMBARI-9119. Adding service does not work on
deployed cluster. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 3e38fda01 -> fc2b91151
AMBARI-9119. Adding service does not work on deployed cluster. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fc2b9115
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fc2b9115
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fc2b9115
Branch: refs/heads/trunk
Commit: fc2b911517a942484b4af3f7f5e3e77c650ab2ac
Parents: 3e38fda
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Wed Jan 14 14:27:13 2015 +0200
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Wed Jan 14 14:51:49 2015 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step7_controller.js | 2 +-
ambari-web/test/controllers/wizard/step7_test.js | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc2b9115/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index 8e343ce..66a54de 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -843,7 +843,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, {
var self = this;
configsByTags.forEach(function (configSite) {
- configsMap[configSite.type] = configSite.properties;
+ configsMap[configSite.type] = configSite.properties || {};
});
configs.forEach(function (_config) {
var nonServiceTab = require('data/service_configs');
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc2b9115/ambari-web/test/controllers/wizard/step7_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step7_test.js b/ambari-web/test/controllers/wizard/step7_test.js
index 669cb58..0ee2305 100644
--- a/ambari-web/test/controllers/wizard/step7_test.js
+++ b/ambari-web/test/controllers/wizard/step7_test.js
@@ -1352,6 +1352,10 @@ describe('App.InstallerStep7Controller', function () {
{
siteName: 'ams-hbase-site',
tagName: 'version1'
+ },
+ {
+ siteName: 'site-without-properties',
+ tagName: 'version1'
}
],
configs = [
@@ -1382,6 +1386,10 @@ describe('App.InstallerStep7Controller', function () {
properties: {
'hbase.client.scanner.caching': '2500'
}
+ },
+ {
+ type: 'site-without-properties',
+ tag: 'version1'
}
],
installedServiceNames = ['HBASE', 'AMS'];