Repository: ambari Updated Branches: refs/heads/branch-dev-patch-upgrade f70591b13 -> 06327e65e
AMBARI-19027. Manage JournalNode tweaks (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d369809c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d369809c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d369809c Branch: refs/heads/branch-dev-patch-upgrade Commit: d369809c96377fc06d33e1ef7bb1f53819e3f275 Parents: d8ba7f1 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Wed Nov 30 13:19:43 2016 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Wed Nov 30 13:58:05 2016 +0200 ---------------------------------------------------------------------- ambari-web/app/messages.js | 12 +++++------- .../main/admin/highAvailability/journalNode/step2.hbs | 2 ++ 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d369809c/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index aa43687..a16d0ea 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1292,7 +1292,7 @@ Em.I18n.translations = { 'admin.kerberos.disable.notice.completed': 'Services have been successfully tested without kerberos environment.', 'admin.kerberos.wizard.step1.notice.inProgress': 'Please wait while cluster is being unkerberized', - 'admin.manageJournalNode.label': 'Manage JournalNode', + 'admin.manageJournalNode.label': 'Manage JournalNodes', 'admin.manageJournalNode.wizard.header': 'Manage JournalNodes Wizard', 'admin.manageJournalNode.wizard.step1.header': 'Assign JournalNodes', 'admin.manageJournalNode.wizard.step2.header': 'Review', @@ -1300,14 +1300,12 @@ Em.I18n.translations = { 'admin.manageJournalNode.wizard.step4.header': 'Add/Remove JournalNodes', 'admin.manageJournalNode.wizard.step5.header': 'Format JournalNodes', 'admin.manageJournalNode.wizard.step6.header': 'Start Active NameNode', - 'admin.manageJournalNode.wizard.step7.header': 'BootStrap StandBy NameNode', + 'admin.manageJournalNode.wizard.step7.header': 'BootStrap Standby NameNode', 'admin.manageJournalNode.wizard.step8.header': 'Start All Services', 'admin.manageJournalNode.wizard.step1.body': 'Add, or Remove JournalNodes', - 'admin.manageJournalNode.wizard.step3.confirm.config.body':'<div class="alert alert-info">' + - '<b>Review Configuration Changes.</b></br>' + - 'The following lists the configuration changes that will be made by the Wizard to manage JournalNode. This information is for <b> review only </b>.' + - '</div>', + 'admin.manageJournalNode.wizard.step3.confirm.config.body': '<b>Configuration Change Review.</b></br>' + + 'As part of this process, configuration changes are required. Please review the changes below, and note that they are for <b>review only</b>. Future steps in this wizard will update this configuration, and restart <b>all</b> services automatically.', 'admin.manageJournalNode.wizard.step4.task0.title' : 'Stop Standby NameNode', 'admin.manageJournalNode.wizard.step4.task1.title': 'Stop Services', @@ -1331,7 +1329,7 @@ Em.I18n.translations = { 'admin.manageJournalNode.wizard.progressPage.notice.inProgress': 'Please wait while JournalNodes are being deployed', 'admin.manageJournalNode.wizard.step6.notice.inProgress': 'Please wait for related services to be started', 'admin.manageJournalNode.wizard.step4.notice.inProgress': 'Please wait while JournalNodes are being deployed', - 'admin.manageJournalNode.wizard.step8.notice.completed':'JournalNodes has been processed successfully.', + 'admin.manageJournalNode.wizard.step8.notice.completed':'Completed update to JournalNodes.', 'admin.manageJournalNode.wizard.step3.body': '<ol>' + http://git-wip-us.apache.org/repos/asf/ambari/blob/d369809c/ambari-web/app/templates/main/admin/highAvailability/journalNode/step2.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/highAvailability/journalNode/step2.hbs b/ambari-web/app/templates/main/admin/highAvailability/journalNode/step2.hbs index 547d364..0cd177d 100644 --- a/ambari-web/app/templates/main/admin/highAvailability/journalNode/step2.hbs +++ b/ambari-web/app/templates/main/admin/highAvailability/journalNode/step2.hbs @@ -69,7 +69,9 @@ </div> <div id="serviceConfig"> {{#if controller.isLoaded}} + <div class="alert alert-info"> {{{t admin.manageJournalNode.wizard.step3.confirm.config.body}}} + </div> {{view App.ServiceConfigView isNotEditableBinding="controller.isNotEditable"}} {{else}} {{view App.SpinnerView}}