You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2015/01/24 16:25:14 UTC
ambari git commit: AMBARI-9316. Adding host on kerberized cluster
fails. (jaimin via yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk cdc7fee38 -> c0167f89d
AMBARI-9316. Adding host on kerberized cluster fails. (jaimin via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c0167f89
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c0167f89
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c0167f89
Branch: refs/heads/trunk
Commit: c0167f89d7c293f39f62fbf9df0b6640bde25b51
Parents: cdc7fee
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Sat Jan 24 07:24:49 2015 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Sat Jan 24 07:24:49 2015 -0800
----------------------------------------------------------------------
ambari-web/app/controllers/main/host/add_controller.js | 2 +-
ambari-web/test/controllers/main/host/add_controller_test.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c0167f89/ambari-web/app/controllers/main/host/add_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/add_controller.js b/ambari-web/app/controllers/main/host/add_controller.js
index aebb95e..0c4c57c 100644
--- a/ambari-web/app/controllers/main/host/add_controller.js
+++ b/ambari-web/app/controllers/main/host/add_controller.js
@@ -152,7 +152,7 @@ App.AddHostController = App.WizardController.extend({
*/
saveClients: function () {
var serviceComponents = App.StackServiceComponent.find();
- var services = this.get('content.services').filterProperty('isSelected');
+ var services = this.get('content.services').filterProperty('isInstallable').filterProperty('isSelected');
var clients = this.getClientsToInstall(services, serviceComponents);
this.setDBProperty('clientInfo', clients);
this.set('content.clients', clients);
http://git-wip-us.apache.org/repos/asf/ambari/blob/c0167f89/ambari-web/test/controllers/main/host/add_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/host/add_controller_test.js b/ambari-web/test/controllers/main/host/add_controller_test.js
index 09de2cf..4333e08 100644
--- a/ambari-web/test/controllers/main/host/add_controller_test.js
+++ b/ambari-web/test/controllers/main/host/add_controller_test.js
@@ -602,10 +602,10 @@ describe('App.AddHostController', function () {
controller.getClientsToInstall.restore();
});
it("", function () {
- controller.set('content.services', [Em.Object.create({'isSelected': true})]);
+ controller.set('content.services', [Em.Object.create({'isSelected': true, 'isInstallable': true})]);
controller.saveClients();
expect(controller.getClientsToInstall.calledWith(
- [Em.Object.create({'isSelected': true})],
+ [Em.Object.create({'isSelected': true, 'isInstallable': true})],
'StackServiceComponent'
)).to.be.true;
expect(controller.setDBProperty.calledWith('clientInfo', ['client'])).to.be.true;