You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/02/03 14:53:45 UTC

[41/50] [abbrv] ambari git commit: AMBARI-19319 Disable auto start before RU/EU and enable during finalization phase

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/b457d7b8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b457d7b8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b457d7b8

Branch: refs/heads/branch-dev-patch-upgrade
Commit: b457d7b874364b105d08a657e37721de973f9dca
Parents: 69c8389
Author: Andrii Tkach <at...@apache.org>
Authored: Thu Feb 2 21:06:55 2017 +0200
Committer: Andrii Tkach <at...@apache.org>
Committed: Thu Feb 2 21:06:55 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/b457d7b8/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 6f8f435..cb88fda 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1818,6 +1818,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/b457d7b8/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 8bb0904..f82cca4 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
@@ -126,6 +126,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}}