Repository: ambari Updated Branches: refs/heads/branch-2.5 0ffa1bcd9 -> 53e1bd8af
AMBARI-19319 Disable auto start before RU/EU and enable during finalization phase Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/53e1bd8a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/53e1bd8a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/53e1bd8a Branch: refs/heads/branch-2.5 Commit: 53e1bd8afa994715fcbd5ab69aae7f512e345246 Parents: 0ffa1bc Author: Andrii Tkach <[email protected]> Authored: Thu Feb 2 21:06:55 2017 +0200 Committer: Andrii Tkach <[email protected]> Committed: Thu Feb 2 21:11:09 2017 +0200 ---------------------------------------------------------------------- ambari-web/app/messages.js | 1 + .../app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/53e1bd8a/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 5e0f2d1..0cd41e0 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1790,6 +1790,7 @@ Em.I18n.translations = { "Click on <b>Finalize</b> when you are ready to finalize the downgrade and commit to the new version." + " You are strongly encouraged to run tests on your cluster to ensure it is fully operational before finalizing." + " <b>You cannot go back to the original version once the downgrade is finalized.</b>", + 'admin.stackUpgrade.finalize.message.autoStart': "Please remember to re-enable Auto Start if you disabled it for upgrade.", 'admin.stackUpgrade.finalize.message.skippedServiceChecks': "During the upgrade, checks for the following services failed and were skipped:", 'admin.stackUpgrade.finalize.message.testServices': "You are strongly recommended to test these services before finalizing upgrade.", 'admin.stackUpgrade.failedHosts.message': "Upgrade did not succeed on", http://git-wip-us.apache.org/repos/asf/ambari/blob/53e1bd8a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs index a86048e..4678f01 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs @@ -127,6 +127,7 @@ {{else}} <p class="manual-steps-content">{{t admin.stackUpgrade.finalize.message.upgrade}}</p> {{/if}} + <p class="manual-steps-content"><strong>{{t admin.stackUpgrade.finalize.message.autoStart}}</strong></p> {{#if areSkippedServiceChecksLoaded}} {{#if skippedServiceChecks.length}}
