You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/04/23 19:02:20 UTC
git commit: AMBARI-5547 Exclude /boot from the mount points to use
for suggesting directories. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 89cdb711e -> e954e2fad
AMBARI-5547 Exclude /boot from the mount points to use for suggesting directories. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e954e2fa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e954e2fa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e954e2fa
Branch: refs/heads/trunk
Commit: e954e2fad68fd54ea5ca26eaf3110dbfda23cfe8
Parents: 89cdb71
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Wed Apr 23 19:51:37 2014 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Wed Apr 23 19:53:13 2014 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step3_controller.js | 2 +-
ambari-web/app/mappers/hosts_mapper.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e954e2fa/ambari-web/app/controllers/wizard/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js
index 61b4d4e..2f3f4c4 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -710,7 +710,7 @@ App.WizardStep3Controller = Em.Controller.extend({
} else if (host) {
_host.set('cpu', host.Hosts.cpu_count);
_host.set('memory', ((parseInt(host.Hosts.total_mem))).toFixed(2));
- _host.set('disk_info', host.Hosts.disk_info);
+ _host.set('disk_info', host.Hosts.disk_info.filter(function(host){ return host.mountpoint!="/boot"}));
_host.set('os_type', host.Hosts.os_type);
_host.set('os_arch', host.Hosts.os_arch);
_host.set('ip', host.Hosts.ip);
http://git-wip-us.apache.org/repos/asf/ambari/blob/e954e2fa/ambari-web/app/mappers/hosts_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/hosts_mapper.js b/ambari-web/app/mappers/hosts_mapper.js
index 30424bc..bd87064 100644
--- a/ambari-web/app/mappers/hosts_mapper.js
+++ b/ambari-web/app/mappers/hosts_mapper.js
@@ -77,7 +77,7 @@ App.hostsMapper = App.QuickDataMapper.create({
item.host_components.forEach(function (host_component) {
host_component.id = host_component.HostRoles.component_name + "_" + hostName;
}, this);
-
+ item.Hosts.disk_info = item.Hosts.disk_info.filter(function(h) {return h.mountpoint!="/boot"});
hostIds[hostName] = true;
currentHostStatuses[hostName] = item.Hosts.host_status;