You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2017/08/25 10:56:55 UTC
ambari git commit: AMBARI-21813 Finalize for MAINT upgrade should not
mention revert. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 919f2e16b -> 0d529b9f2
AMBARI-21813 Finalize for MAINT upgrade should not mention revert. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0d529b9f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0d529b9f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0d529b9f
Branch: refs/heads/branch-2.6
Commit: 0d529b9f24dac14fa948e5077f072d6912c0ef84
Parents: 919f2e1
Author: Andrii Tkach <at...@apache.org>
Authored: Fri Aug 25 13:19:03 2017 +0300
Committer: Andrii Tkach <at...@apache.org>
Committed: Fri Aug 25 13:19:03 2017 +0300
----------------------------------------------------------------------
.../views/main/admin/stack_upgrade/upgrade_version_box_view.js | 4 ++--
.../app/views/main/admin/stack_upgrade/upgrade_wizard_view.js | 4 ++--
.../controllers/main/service/reassign/step1_controller_test.js | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0d529b9f/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
index 83243a5..d25a656 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
@@ -176,13 +176,13 @@ App.UpgradeVersionBoxView = Em.View.extend({
});
var isSuspended = App.get('upgradeSuspended');
- if (status === 'CURRENT' && (this.get('content.isPatch') || this.get('content.isMaint')) && !this.get('isUpgrading')) {
+ if (status === 'CURRENT' && this.get('content.isPatch') && !this.get('isUpgrading')) {
element.setProperties(statePropertiesMap['CURRENT_PATCH']);
}
else if (['INSTALLING'].contains(status)) {
element.setProperties(statePropertiesMap[status]);
}
- else if (['CURRENT'].contains(status) && (!this.get('content.isPatch') && !this.get('content.isMaint'))) {
+ else if (['CURRENT'].contains(status) && !this.get('content.isPatch')) {
element.setProperties(statePropertiesMap[status]);
}
else if (status === 'NOT_REQUIRED') {
http://git-wip-us.apache.org/repos/asf/ambari/blob/0d529b9f/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
index e3f7cb7..10e34ab 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
@@ -208,12 +208,12 @@ App.upgradeWizardView = Em.View.extend({
isFinalizeItem: Em.computed.equalProperties('manualItem.context', 'controller.finalizeContext'),
/**
- * Upgrade of PATCH or MAINT version is revertible
+ * Upgrade of PATCH version is revertible
*/
isRevertibleUpgrade: function() {
var associatedVersion = this.get('controller.upgradeData.Upgrade.associated_version');
var upgradeVersion = App.RepositoryVersion.find().findProperty('repositoryVersion', associatedVersion);
- return ['PATCH', 'MAINT'].contains(upgradeVersion.get('type'));
+ return ['PATCH'].contains(upgradeVersion.get('type'));
}.property('controller.upgradeData.Upgrade.associated_version'),
revertibleFinalizeMessage: function() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/0d529b9f/ambari-web/test/controllers/main/service/reassign/step1_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/service/reassign/step1_controller_test.js b/ambari-web/test/controllers/main/service/reassign/step1_controller_test.js
index 7dbf24a..1a020a0 100644
--- a/ambari-web/test/controllers/main/service/reassign/step1_controller_test.js
+++ b/ambari-web/test/controllers/main/service/reassign/step1_controller_test.js
@@ -112,6 +112,7 @@ describe('App.ReassignMasterWizardStep1Controller', function () {
sinon.stub(controller, 'saveDatabaseType', Em.K);
sinon.stub(controller, 'saveServiceProperties', Em.K);
sinon.stub(controller, 'saveConfigs', Em.K);
+ sinon.stub(controller, 'isExistingDb');
reassignCtrl = App.router.reassignMasterController;
reassignCtrl.set('content.hasManualSteps', true);
@@ -122,6 +123,7 @@ describe('App.ReassignMasterWizardStep1Controller', function () {
controller.saveDatabaseType.restore();
controller.saveServiceProperties.restore();
controller.saveConfigs.restore();
+ controller.isExistingDb.restore();
});
it('should not set hasManualSteps to false for oozie with derby db', function() {