ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akovale...@apache.org
Subject git commit: AMBARI-6206. BGO popup: Incorrect number of tasks in category. (akovalenko)
Date Thu, 19 Jun 2014 12:40:55 GMT
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 <akovalenko@hortonworks.com>
Authored: Thu Jun 19 15:39:06 2014 +0300
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
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 <b>OR</b>
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]


Mime
View raw message