You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/11/22 01:27:46 UTC
git commit: AMBARI-3845. Incorrect warning message when trying to
delete host with running components. (xiwang via yusaku)
Updated Branches:
refs/heads/trunk 94dae6609 -> ceaa02b23
AMBARI-3845. Incorrect warning message when trying to delete host with running components. (xiwang via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/ceaa02b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/ceaa02b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/ceaa02b2
Branch: refs/heads/trunk
Commit: ceaa02b23a7ae7890a9aa5f4db5ed735a4f029e7
Parents: 94dae66
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Thu Nov 21 16:21:48 2013 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Thu Nov 21 16:28:09 2013 -0800
----------------------------------------------------------------------
ambari-web/app/messages.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ceaa02b2/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 2a59bb0..79b1d5d 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1371,11 +1371,11 @@ Em.I18n.translations = {
'hosts.delete.popup.title':'Delete Host',
'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':'Host cannot be deleted with the master components installed',
- 'hosts.cant.do.popup.masterList.body.end':'The master components on this host must to be stopped and moved to a different host to be able to delete this 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':'<strong>Note:</strong> To delete this host, you must first move all the master components listed above to another host.',
'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 it has the following master components: ',
- 'hosts.cant.do.popup.runningList.body.end':'<strong>Note:</strong> To delete this host, you must first move all the master components listed above to another host.',
+ 'hosts.cant.do.popup.runningList.body':'This host cannot be deleted since the following components are still running:',
+ 'hosts.cant.do.popup.runningList.body.end':'<strong>Note:</strong> To delete this host, you must first stop all the running components listed above.',
'hosts.add.header':'Add Host Wizard',
'hosts.assignRack':'Assign Rack',