You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2015/08/28 12:01:37 UTC
[1/2] ambari git commit: AMBARI-12879. Warn the user about HDFS
Upgrade not finalized in Ambari Web UI (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 773f67eca -> 33c694b18
AMBARI-12879. Warn the user about HDFS Upgrade not finalized in Ambari Web UI (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e04050e8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e04050e8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e04050e8
Branch: refs/heads/branch-2.1
Commit: e04050e85f2fe65a9a255a79840f82a7927e0c73
Parents: 773f67e
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Fri Aug 28 12:51:30 2015 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Fri Aug 28 12:51:30 2015 +0300
----------------------------------------------------------------------
ambari-web/app/templates/application.hbs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e04050e8/ambari-web/app/templates/application.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/application.hbs b/ambari-web/app/templates/application.hbs
index 3b373d6..a72e3d6 100644
--- a/ambari-web/app/templates/application.hbs
+++ b/ambari-web/app/templates/application.hbs
@@ -142,7 +142,7 @@
</a>
</p>
{{#if App.router.mainAdminStackAndUpgradeController.isFinalizeItem}}
- <p class="span10 alert alert-warning">{{t admin.stackVersions.version.upgrade.notFinalized.warning}}</p>
+ <p class="span10 alert alert-danger">{{t admin.stackVersions.version.upgrade.notFinalized.warning}}</p>
{{/if}}
{{/if}}
</div>
[2/2] ambari git commit: AMBARI-12868. Improve calls to the
localStorage (onechiporenko)
Posted by on...@apache.org.
AMBARI-12868. Improve calls to the localStorage (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/33c694b1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/33c694b1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/33c694b1
Branch: refs/heads/branch-2.1
Commit: 33c694b181c5c1c10293bc4ecf008d54960fc23b
Parents: e04050e
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Fri Aug 28 12:53:36 2015 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Fri Aug 28 12:53:36 2015 +0300
----------------------------------------------------------------------
.../app/controllers/main/admin/stack_and_upgrade_controller.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/33c694b1/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index fa5b479..ddca7f1 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -163,7 +163,9 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
initDBProperties: function () {
var props = this.getDBProperties(this.get('wizardStorageProperties'));
Em.keys(props).forEach(function (k) {
- this.set(k, props[k]);
+ if (props[k]) {
+ this.set(k, props[k]);
+ }
}, this);
},