You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/06/08 23:36:02 UTC
[1/2] ambari git commit: AMBARI-11793. After upgrade to Ambari 2.1,
YARN save settings not working (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk c13c5828b -> 87586c670
AMBARI-11793. After upgrade to Ambari 2.1, YARN save settings not working (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d668f2cb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d668f2cb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d668f2cb
Branch: refs/heads/trunk
Commit: d668f2cb1dae5a69a10af4c339c8469fbdabeb52
Parents: c13c582
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon Jun 8 22:12:56 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue Jun 9 00:35:18 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/info/configs.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d668f2cb/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index 59e03ef..a21baa1 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -962,7 +962,9 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
componentConfig.get('configs').pushObject(serviceConfigProperty);
serviceConfigProperty.validate();
}, this);
- componentConfig.set('initConfigsLength', componentConfig.get('configs.length'));
+ Em.run.next(function () {
+ componentConfig.set('initConfigsLength', componentConfig.get('configs.length'));
+ });
},
/**
[2/2] ambari git commit: AMBARI-11794. RU: during upgrade reopening
of browser sends to strange page (alexantonenko)
Posted by al...@apache.org.
AMBARI-11794. RU: during upgrade reopening of browser sends to strange page (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/87586c67
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/87586c67
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/87586c67
Branch: refs/heads/trunk
Commit: 87586c6703ec2c4952d8e4d0e399f5b8b3938fdb
Parents: d668f2c
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon Jun 8 22:17:08 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue Jun 9 00:35:40 2015 +0300
----------------------------------------------------------------------
ambari-web/app/data/controller_route.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/87586c67/ambari-web/app/data/controller_route.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/controller_route.js b/ambari-web/app/data/controller_route.js
index b324b51..d6319f5 100644
--- a/ambari-web/app/data/controller_route.js
+++ b/ambari-web/app/data/controller_route.js
@@ -63,7 +63,7 @@ module.exports = [
},
{
wizardControllerName: App.router.get('mainAdminStackAndUpgradeController.name'),
- route: 'main.admin.stackAndUpgrade'
+ route: App.db.get('MainAdminStackAndUpgrade', 'upgradeState') == 'INIT' ? 'main.admin.stackAndUpgrade.index' : 'main.admin.stackAndUpgrade.versions'
},
{
wizardControllerName: App.router.get('widgetWizardController.name'),