Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 48F96E570 for ; Wed, 30 Jan 2013 00:49:00 +0000 (UTC) Received: (qmail 37800 invoked by uid 500); 30 Jan 2013 00:49:00 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 37774 invoked by uid 500); 30 Jan 2013 00:49:00 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 37766 invoked by uid 99); 30 Jan 2013 00:49:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Jan 2013 00:49:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Jan 2013 00:48:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E8C0D23888CD; Wed, 30 Jan 2013 00:48:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1440230 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/wizard/step3_controller.js Date: Wed, 30 Jan 2013 00:48:37 -0000 To: ambari-commits@incubator.apache.org From: yusaku@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130130004837.E8C0D23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: yusaku Date: Wed Jan 30 00:48:37 2013 New Revision: 1440230 URL: http://svn.apache.org/viewvc?rev=1440230&view=rev Log: AMBARI-1292. Add hosts should skip host checks on existing list of cluster nodes. (srimanth via yusaku) Modified: incubator/ambari/trunk/CHANGES.txt incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js Modified: incubator/ambari/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1440230&r1=1440229&r2=1440230&view=diff ============================================================================== --- incubator/ambari/trunk/CHANGES.txt (original) +++ incubator/ambari/trunk/CHANGES.txt Wed Jan 30 00:48:37 2013 @@ -175,10 +175,14 @@ Trunk (unreleased changes): AMBARI-1269. Refactor ResourceProvider SPI. (tbeerbower) - AMBARI-1270. Add predicate objects for checking empty resource category. (tbeerbower) + AMBARI-1270. Add predicate objects for checking empty resource category. + (tbeerbower) BUG FIXES + AMBARI-1292. Add hosts should skip host checks on existing list of cluster + nodes. (srimanth via yusaku) + AMBARI-1290. Left border is missing from the summary section on Jobs page. (srimanth via yusaku) Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js?rev=1440230&r1=1440229&r2=1440230&view=diff ============================================================================== --- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js (original) +++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js Wed Jan 30 00:48:37 2013 @@ -645,10 +645,32 @@ App.WizardStep3Controller = Em.Controlle checksUpdateProgress:0, checksUpdateStatus: null, /** + * filter data for warnings parse + * is data from host in bootStrap + * @param data + * @return {Object} + */ + filterBootHosts: function(data){ + var bootHosts = this.get('bootHosts'); + var filteredData = { + href: data.href, + items: [] + }; + bootHosts.forEach(function(bootHost){ + data.items.forEach(function(host){ + if(host.Hosts.host_name == bootHost.get('name')){ + filteredData.items.push(host); + } + }) + }) + return filteredData; + }, + /** * parse warnings data for each host and total * @param data */ parseWarnings: function(data){ + data = this.filterBootHosts(data); var warnings = []; var totalWarnings = { hostName: 'All Hosts',