Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4819011434 for ; Thu, 19 Jun 2014 12:40:56 +0000 (UTC) Received: (qmail 35046 invoked by uid 500); 19 Jun 2014 12:40:56 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 35015 invoked by uid 500); 19 Jun 2014 12:40:56 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 35003 invoked by uid 99); 19 Jun 2014 12:40:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jun 2014 12:40:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D03FC983D78; Thu, 19 Jun 2014 12:40:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akovalenko@apache.org To: commits@ambari.apache.org Message-Id: <6940ea0c2ee24e12ac670bcdf8ca923d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-6206. BGO popup: Incorrect number of tasks in category. (akovalenko) Date: Thu, 19 Jun 2014 12:40:55 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk 9aae43f09 -> 345354072 AMBARI-6206. BGO popup: Incorrect number of tasks in category. (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/34535407 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/34535407 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/34535407 Branch: refs/heads/trunk Commit: 34535407286a9c4c5f437ea829b9be9c7f1f098e Parents: 9aae43f Author: Aleksandr Kovalenko Authored: Thu Jun 19 15:39:06 2014 +0300 Committer: Aleksandr Kovalenko Committed: Thu Jun 19 15:39:06 2014 +0300 ---------------------------------------------------------------------- ambari-web/app/messages.js | 2 +- ambari-web/app/utils/host_progress_popup.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/34535407/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index aa82ec3..2cf9ff8 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -660,7 +660,7 @@ Em.I18n.translations = { 'installer.step9.hostLog.popup.categories.in_progress':'In Progress', 'installer.step9.hostLog.popup.categories.failed':'Failed', 'installer.step9.hostLog.popup.categories.completed':'Success', - 'installer.step9.hostLog.popup.categories.aborted':'Cancelled', + 'installer.step9.hostLog.popup.categories.aborted':'Aborted', 'installer.step9.hostLog.popup.categories.timedout':'Timed Out', 'installer.step9.hostLog.popup.noTasksToShow':'No tasks to show', 'installer.step9.host.status.noTasks': 'Ambari server did not schedule any tasks on the host. Either the service component on the host is already in installed state OR the pre-check of host reachability failed.', http://git-wip-us.apache.org/repos/asf/ambari/blob/34535407/ambari-web/app/utils/host_progress_popup.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/host_progress_popup.js b/ambari-web/app/utils/host_progress_popup.js index 6b0efd0..c582cac 100644 --- a/ambari-web/app/utils/host_progress_popup.js +++ b/ambari-web/app/utils/host_progress_popup.js @@ -142,7 +142,7 @@ App.HostPopup = Em.Object.create({ if (isFailed) { status = ['FAILED', 'icon-exclamation-sign', 'progress-danger', false]; } else if (isAborted) { - status = ['CANCELLED', 'icon-minus', 'progress-warning', false]; + status = ['ABORTED', 'icon-minus', 'progress-warning', false]; } else if (isTimedout) { status = ['TIMEDOUT', 'icon-time', 'progress-warning', false]; } else if (isInProgress) { @@ -255,7 +255,7 @@ App.HostPopup = Em.Object.create({ var allNewServices = []; var statuses = { 'FAILED': ['FAILED', 'icon-exclamation-sign', 'progress-danger', false], - 'ABORTED': ['CANCELLED', 'icon-minus', 'progress-warning', false], + 'ABORTED': ['ABORTED', 'icon-minus', 'progress-warning', false], 'TIMEDOUT': ['TIMEDOUT', 'icon-time', 'progress-warning', false], 'IN_PROGRESS': ['IN_PROGRESS', 'icon-cogs', 'progress-info', true], 'COMPLETED': ['SUCCESS', 'icon-ok', 'progress-success', false]