Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 88082200BD0 for ; Wed, 30 Nov 2016 12:58:12 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 869F9160B13; Wed, 30 Nov 2016 11:58:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D215E160B08 for ; Wed, 30 Nov 2016 12:58:11 +0100 (CET) Received: (qmail 81040 invoked by uid 500); 30 Nov 2016 11:58:10 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 81031 invoked by uid 99); 30 Nov 2016 11:58:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Nov 2016 11:58:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 857C9DFC55; Wed, 30 Nov 2016 11:58:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: onechiporenko@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-19027. Manage JournalNode tweaks (onechiporenko) Date: Wed, 30 Nov 2016 11:58:10 +0000 (UTC) archived-at: Wed, 30 Nov 2016 11:58:12 -0000 Repository: ambari Updated Branches: refs/heads/trunk d8ba7f1ba -> d369809c9 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/trunk Commit: d369809c96377fc06d33e1ef7bb1f53819e3f275 Parents: d8ba7f1 Author: Oleg Nechiporenko Authored: Wed Nov 30 13:19:43 2016 +0200 Committer: Oleg Nechiporenko 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':'
' + - 'Review Configuration Changes.
' + - 'The following lists the configuration changes that will be made by the Wizard to manage JournalNode. This information is for review only .' + - '
', + 'admin.manageJournalNode.wizard.step3.confirm.config.body': 'Configuration Change Review.
' + + 'As part of this process, configuration changes are required. Please review the changes below, and note that they are for review only. Future steps in this wizard will update this configuration, and restart all 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': '
    ' + 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 @@
    {{#if controller.isLoaded}} +
    {{{t admin.manageJournalNode.wizard.step3.confirm.config.body}}} +
    {{view App.ServiceConfigView isNotEditableBinding="controller.isNotEditable"}} {{else}} {{view App.SpinnerView}}