Repository: ambari Updated Branches: refs/heads/trunk 8ea88104f -> 0b18f023b
AMBARI-16661. Provide Information Message About Suspended Alerts During Upgrade (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0b18f023 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0b18f023 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0b18f023 Branch: refs/heads/trunk Commit: 0b18f023b4188b952e3fc835da3f5a6ccf1e206e Parents: 8ea8810 Author: Aleksandr Kovalenko <[email protected]> Authored: Fri May 13 18:32:07 2016 +0300 Committer: Aleksandr Kovalenko <[email protected]> Committed: Fri May 13 20:14:14 2016 +0300 ---------------------------------------------------------------------- ambari-web/app/messages.js | 1 + .../app/templates/main/admin/stack_upgrade/upgrade_options.hbs | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0b18f023/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 910bed7..46c073b 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1617,6 +1617,7 @@ Em.I18n.translations = { 'admin.stackVersions.version.upgrade.upgradeOptions.notAllowed':'Not allowed by the current version', 'admin.stackVersions.version.upgrade.upgradeOptions.EU.confirm.msg': 'You are about to perform an <b>Express Upgrade</b> from <b>{0}</b> to <b>{1}</b>. This will incur cluster downtime. Are you sure you want to proceed?', 'admin.stackVersions.version.upgrade.upgradeOptions.RU.confirm.msg': 'You are about to perform a <b>Rolling Upgrade</b> from <b>{0}</b> to <b>{1}</b>. Are you sure you want to proceed?', + 'admin.stackVersions.version.upgrade.alertsWarning': 'Cluster alerts will still be visible and recorded in Ambari but notifications (such as Email and SNMP) will be suppressed during the upgrade.', 'admin.stackVersions.version.column.showDetails': "Show Details", 'admin.stackVersions.version.column.showDetails.title': "Version Details", http://git-wip-us.apache.org/repos/asf/ambari/blob/0b18f023/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_options.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_options.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_options.hbs index d150a27..f5972bd 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_options.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_options.hbs @@ -59,4 +59,5 @@ <label class="tolerance-option">{{view Ember.Checkbox checkedBinding="view.parentView.skipComponentFailures"}} {{t admin.stackVersions.version.upgrade.upgradeOptions.tolerance.option1}}</label> </div> + <div class="alert alert-warning">{{t admin.stackVersions.version.upgrade.alertsWarning}}</div> </div>
