ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject git commit: AMBARI-4810. Bulk decommissioning multiple slaves makes it look like only one slave is being decommissioned. (xiwang via yusaku)
Date Tue, 25 Feb 2014 00:44:44 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 7b8741ba7 -> 0d0fe121c


AMBARI-4810. Bulk decommissioning multiple slaves makes it look like only one slave is being
decommissioned. (xiwang via yusaku)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0d0fe121
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0d0fe121
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0d0fe121

Branch: refs/heads/trunk
Commit: 0d0fe121c98a512a74c8d2e421e758dc5c3d1bec
Parents: 7b8741b
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Mon Feb 24 16:44:23 2014 -0800
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Mon Feb 24 16:44:23 2014 -0800

----------------------------------------------------------------------
 ambari-web/app/utils/helper.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0d0fe121/ambari-web/app/utils/helper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js
index 553341b..0815d61 100644
--- a/ambari-web/app/utils/helper.js
+++ b/ambari-web/app/utils/helper.js
@@ -236,7 +236,8 @@ App.format = {
     'UPGRADE': 'Upgrade',
     'RESTART': 'Restart',
     'SERVICE_CHECK': 'Check',
-    'DECOMMISSION,': 'Decommission,'
+    'Excluded:': 'Decommission:',
+    'Included:': 'Recommission:'
   },
 
   /**
@@ -260,6 +261,10 @@ App.format = {
       if (item.contains('/')) {
         item = item.split('/')[1];
       }
+      // ignore 'DECOMMISSION', command came from 'excluded/included'
+      if (item == 'DECOMMISSION,') {
+        item = '';
+      }
       if (self.components[item]) {
         result = result + ' ' + self.components[item];
       } else if (self.command[item]) {


Mime
View raw message