You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2014/04/08 02:04:43 UTC
[1/2] git commit: AMBARI-5386. Deploy stuck during generating tasks
on Review page (not always reproduced). (yusaku)
Repository: ambari
Updated Branches:
refs/heads/branch-1.5.1 6c80c4140 -> 27b443003
AMBARI-5386. Deploy stuck during generating tasks on Review page (not always reproduced). (yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/06730c6b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/06730c6b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/06730c6b
Branch: refs/heads/branch-1.5.1
Commit: 06730c6b6e35490e152671045a6d3bbaedfff23c
Parents: 6c80c41
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Mon Apr 7 16:15:25 2014 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Mon Apr 7 17:01:31 2014 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step8_controller.js | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/06730c6b/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index 609037a..960cf57 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -838,6 +838,10 @@ App.WizardStep8Controller = Em.Controller.extend({
/**
* Updates local repositories for the Ambari server.
+ * Base URL validation is disabled, since the checks had already run in the Select Stacks page
+ * already (unless the user specifically asked to skip).
+ * TODO: This function should be deleted once we modify App.InstallerController to make
+ * sure that base URLs are saved even when "Skip validation" is checked.
*/
setLocalRepositories: function () {
if (this.get('content.controllerName') !== 'installerController' || !App.supports.localRepositories) return;
@@ -852,7 +856,8 @@ App.WizardStep8Controller = Em.Controller.extend({
url: App.apiPrefix + App.get('stack2VersionURL') + "/operatingSystems/" + os.osType + "/repositories/" + stack.name,
data: JSON.stringify({
"Repositories": {
- "base_url": os.baseUrl
+ "base_url": os.baseUrl,
+ "verify_base_url": false
}
})
});
@@ -1491,4 +1496,4 @@ App.WizardStep8Controller = Em.Controller.extend({
this.get('ajaxQueue').pushObject(params);
}
-});
\ No newline at end of file
+});
[2/2] git commit: AMBARI-5381. Installer: 'Undo' button for repo
BaseURL is unnecessarily present. (xiwang via yusaku)
Posted by yu...@apache.org.
AMBARI-5381. Installer: 'Undo' button for repo BaseURL is unnecessarily present. (xiwang via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/27b44300
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/27b44300
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/27b44300
Branch: refs/heads/branch-1.5.1
Commit: 27b4430037feecd2a1c0c1de3cad4ce5209951f7
Parents: 06730c6
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Mon Apr 7 16:57:05 2014 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Mon Apr 7 17:01:38 2014 -0700
----------------------------------------------------------------------
ambari-web/app/views/wizard/step1_view.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/27b44300/ambari-web/app/views/wizard/step1_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step1_view.js b/ambari-web/app/views/wizard/step1_view.js
index 17211fb..5734a4d 100644
--- a/ambari-web/app/views/wizard/step1_view.js
+++ b/ambari-web/app/views/wizard/step1_view.js
@@ -222,7 +222,7 @@ App.WizardStep1View = Em.View.extend({
group.set('empty-error', !os.baseUrl);
group.set('invalid-error', os.validation == 'icon-exclamation-sign');
group.set('validation', os.validation);
- group.set('undo', os.baseUrl != os.defaultBaseUrl);
+ group.set('undo', os.baseUrl != os.latestBaseUrl);
group.set('clearAll', os.baseUrl);
group.set('errorTitle', os.errorTitle);
group.set('errorContent', os.errorContent);
@@ -247,7 +247,7 @@ App.WizardStep1View = Em.View.extend({
os.selected = false;
targetGroup.set('baseUrl', os.latestBaseUrl);
targetGroup.set('latestBaseUrl', os.latestBaseUrl);
- targetGroup.set('undo', targetGroup.get('baseUrl') != targetGroup.get('defaultBaseUrl'));
+ targetGroup.set('undo', targetGroup.get('baseUrl') != targetGroup.get('latestBaseUrl'));
targetGroup.set('invalid-error', false);
targetGroup.set('validation', null);
targetGroup.set('clearAll', false);
@@ -327,7 +327,7 @@ App.WizardStep1View = Em.View.extend({
if (os.baseUrl != targetGroup.get('baseUrl')) {
os.baseUrl = targetGroup.get('baseUrl');
os.validation = null;
- targetGroup.set('undo', targetGroup.get('baseUrl') != targetGroup.get('defaultBaseUrl'));
+ targetGroup.set('undo', targetGroup.get('baseUrl') != targetGroup.get('latestBaseUrl'));
targetGroup.set('invalid-error', false);
targetGroup.set('validation', null);
targetGroup.set('clearAll', os.baseUrl);