Updated Branches: refs/heads/trunk edbd458c7 -> d100c9b44
AMBARI-2768. Host Checks > Show Report is showing bogus information for FILES AND FOLDERS. (Oleg Nechiporenko 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/d100c9b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/d100c9b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/d100c9b4 Branch: refs/heads/trunk Commit: d100c9b44c264f1b181cfecdc17be24501a97fce Parents: edbd458 Author: Yusaku Sako <[email protected]> Authored: Tue Jul 30 11:23:48 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Tue Jul 30 11:23:48 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step3_controller.js | 2 +- ambari-web/app/messages.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/d100c9b4/ambari-web/app/controllers/wizard/step3_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js index d929498..9c46802 100644 --- a/ambari-web/app/controllers/wizard/step3_controller.js +++ b/ambari-web/app/controllers/wizard/step3_controller.js @@ -1043,7 +1043,7 @@ App.WizardStep3Controller = Em.Controller.extend({ newContent += warningsByHost.filterProperty('warnings.length').mapProperty('name').join(' '); if (content.findProperty('category', 'fileFolders').warnings.length) { newContent += Em.I18n.t('installer.step3.hostWarningsPopup.report.fileFolders'); - newContent += content.findProperty('category', 'fileFolders').warnings.mapProperty('name').join(' ') + Em.I18n.t('installer.step3.hostWarningsPopup.report.folder'); + newContent += content.findProperty('category', 'fileFolders').warnings.mapProperty('name').join(' '); } if (content.findProperty('category', 'process').warnings.length) { newContent += Em.I18n.t('installer.step3.hostWarningsPopup.report.process'); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/d100c9b4/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 4dda231..38844ab 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -333,7 +333,7 @@ Em.I18n.translations = { 'installer.step3.hostWarningsPopup.report':'Show Report', 'installer.step3.hostWarningsPopup.report.header': '<p style="font-family: monospace">######################################<br># Host Checks Report<br>#<br># Generated: ', 'installer.step3.hostWarningsPopup.report.hosts': '<br>######################################<br><br>######################################<br># Hosts<br>#<br># A space delimited list of hosts which have issues.<br># Provided so that administrators can easily copy hostnames into scripts, email etc.<br>######################################<br>HOSTS<br>', - 'installer.step3.hostWarningsPopup.report.fileFolders': '<br><br>######################################<br># Files and Folders<br>#<br># A space delimited list of files and folders which should not exist.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br># Example: rm -r /etc/hadoop /etc/hbase /etc/some\\ /folder<br>######################################<br>FILES AND FOLDERS<br>', + 'installer.step3.hostWarningsPopup.report.fileFolders': '<br><br>######################################<br># Files and Folders<br>#<br># A space delimited list of files and folders which should not exist.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br># Example: rm -r /etc/hadoop /etc/hbase<br>######################################<br>FILES AND FOLDERS<br>', 'installer.step3.hostWarningsPopup.report.process': '<br><br>######################################<br># Processes<br>#<br># A comma separated list of process tuples which should not be running.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br>######################################<br>PROCESSES<br>', 'installer.step3.hostWarningsPopup.report.package': '<br><br>######################################<br># Packages<br>#<br># A space delimited list of software packages which should be uninstalled.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br># Example: yum remove hadoop-hdfs nagios<br>######################################<br>PACKAGES<br>', 'installer.step3.hostWarningsPopup.report.service': '<br><br>######################################<br># Services<br>#<br># A space delimited list of services which should be up and running.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br># Example: services start ntpd httpd<br>######################################<br>SERVICES<br>',
