ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rz...@apache.org
Subject ambari git commit: AMBARI-16831 - Atlas metadaserver doesn't show up in warning popup while deleting a host (rzang)
Date Tue, 24 May 2016 18:52:43 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk e14ee5795 -> b121d2adb


AMBARI-16831 - Atlas metadaserver doesn't show up in warning popup while deleting a host (rzang)


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

Branch: refs/heads/trunk
Commit: b121d2adb36134624f73f7cee2c439bfd31e21a8
Parents: e14ee57
Author: Richard Zang <rzang@apache.org>
Authored: Tue May 24 11:48:51 2016 -0700
Committer: Richard Zang <rzang@apache.org>
Committed: Tue May 24 11:51:35 2016 -0700

----------------------------------------------------------------------
 ambari-web/app/controllers/main/host/details.js | 2 +-
 ambari-web/app/messages.js                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b121d2ad/ambari-web/app/controllers/main/host/details.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js
index b16ef46..07991b0 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -2092,7 +2092,7 @@ App.MainHostDetailsController = Em.Controller.extend(App.SupportClientConfigsDow
           container.lastComponents.push(cInstance.get('displayName'));
         }
         var workStatus = cInstance.get('workStatus');
-        if (cInstance.get('isMaster') && !cInstance.get('isDeletable')) {
+        if (cInstance.get('isMaster')) {
           container.masterComponents.push(cInstance.get('displayName'));
         }
         if (stoppedStates.indexOf(workStatus) < 0) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/b121d2ad/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 980f60e..8763721 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2543,7 +2543,7 @@ Em.I18n.translations = {
   'hosts.delete.popup.unknownComponents':'The following components have unknown status:',
   'hosts.cant.do.popup.title':'Unable to Delete Host',
   'hosts.cant.do.popup.masterList.body':'This host cannot be deleted since it has the following
master components:',
-  'hosts.cant.do.popup.masterList.body.end':'To delete this host, you must first move all
the master components listed above to another host.',
+  'hosts.cant.do.popup.masterList.body.end':'To delete this host, you must first move or
delete all the master components listed above.',
   'hosts.cant.do.popup.nonDeletableList.body':'Deletion of the following {0} components is
not supported. ',
   'hosts.cant.do.popup.runningList.body':'This host cannot be deleted since the following
components are running:',
   'hosts.cant.do.popup.runningList.body.end':'To delete this host, you must first stop all
the running components listed above. ' +


Mime
View raw message