You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2013/11/06 01:48:02 UTC
git commit: AMBARI-3698: Modify UI text for host cleanup. (jaimin)
Updated Branches:
refs/heads/trunk 5b8530170 -> b5d956052
AMBARI-3698: Modify UI text for host cleanup. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/b5d95605
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/b5d95605
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/b5d95605
Branch: refs/heads/trunk
Commit: b5d95605291df23c0cc514684c4e05ce0d7e4d79
Parents: 5b85301
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Tue Nov 5 16:46:14 2013 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Tue Nov 5 16:46:37 2013 -0800
----------------------------------------------------------------------
ambari-web/app/messages.js | 5 ++++-
ambari-web/app/styles/application.less | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/b5d95605/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 97cc70a..ce362fb 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -353,7 +353,10 @@ Em.I18n.translations = {
'installer.step3.hostWarningsPopup.report.user': '<br><br>######################################<br># Users<br>#<br># A space delimited list of users who should not exist.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br># Example: userdel hdfs<br>######################################<br>USERS<br>',
'installer.step3.hostWarningsPopup.report.folder': '\\ /folder',
'installer.step3.hostWarningsPopup.checks': 'Host Checks found',
- 'installer.step3.hostWarningsPopup.notice':'After manually resolving the issues, click <b>Rerun Checks</b>.<br>To manually resolve issues on <b>each host</b> run the HostCleanup script (Python 2.6 or greater is required):<br><div class="code-snippet">python /usr/lib/python2.6/site-packages/ambari_agent/HostCleanup.py</div>',
+ 'installer.step3.hostWarningsPopup.notice':'After manually resolving the issues, click <b>Rerun Checks</b>.'+
+ '<br>To manually resolve issues on <b>each host</b> run the HostCleanup script (Python 2.6 or greater is required):'+
+ '<br><div class="code-snippet">python /usr/lib/python2.6/site-packages/ambari_agent/HostCleanup.py --silent --skip=users</div>' +
+ '<div class="alert alert-warn"><b>Note</b>: To clean up in interactive mode, remove <b>--silent</b> option. To clean up all resources, including <i>users</i>, remove <b>--skip=users</b> option. Use <b>--help</b> for a list of available options.</div>',
'installer.step3.hostWarningsPopup.summary':'{0} on {1}',
'installer.step3.hostWarningsPopup.firewall':'Firewall Issues',
'installer.step3.hostWarningsPopup.firewall.message':'Firewall is running on the following hosts. Please configure the firewall to allow communications on the ports documented in the <i>Configuring Ports</i> section of the <a target=\"_blank\" href=\"http://incubator.apache.org/ambari/current/installing-hadoop-using-ambari/content/\">Ambari documentation</a>',
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/b5d95605/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 6ec0161..0c3767e 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2837,6 +2837,7 @@ table.graphs {
}
.code-snippet {
margin: 10px 0;
+ white-space:normal;
}
.warnings-list {
.block {