You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/03/09 21:06:59 UTC
[1/2] ambari git commit: AMBARI-9956 RU: display repository name in
versionbox 2. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 0fca70f2c -> f933450b9
AMBARI-9956 RU: display repository name in versionbox 2. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f933450b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f933450b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f933450b
Branch: refs/heads/branch-2.0.0
Commit: f933450b9fced69f6fc29ff346ba647002981553
Parents: c13e648
Author: aBabiichuk <ab...@hortonworks.com>
Authored: Mon Mar 9 20:48:34 2015 +0200
Committer: aBabiichuk <ab...@hortonworks.com>
Committed: Mon Mar 9 22:06:47 2015 +0200
----------------------------------------------------------------------
ambari-web/app/styles/stack_versions.less | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f933450b/ambari-web/app/styles/stack_versions.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/stack_versions.less b/ambari-web/app/styles/stack_versions.less
index 7749517..5416aac 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -173,7 +173,7 @@
}
}
.installing {
- margin-top: 11px;
+ margin-top: 10px;
padding-top: 0;
padding-bottom: 10px;
.progress {
@@ -208,8 +208,8 @@
text-align: center;
color: #888;
font-size: 12px;
- margin: 0px 0px -17px 0px;
- padding: 0px;
+ margin: 0px 0px -18px 1px;
+ padding: 1px;
}
.hosts-section {
margin-top: 16px;
[2/2] ambari git commit: AMBARI-9986 Upgrade from 1.6.1: Host page
does not load. (ababiichuk)
Posted by ab...@apache.org.
AMBARI-9986 Upgrade from 1.6.1: Host page does not load. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c13e648f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c13e648f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c13e648f
Branch: refs/heads/branch-2.0.0
Commit: c13e648fd6b8571697523ae5f577787a0a961e3f
Parents: 0fca70f
Author: aBabiichuk <ab...@hortonworks.com>
Authored: Mon Mar 9 20:47:20 2015 +0200
Committer: aBabiichuk <ab...@hortonworks.com>
Committed: Mon Mar 9 22:06:47 2015 +0200
----------------------------------------------------------------------
ambari-web/app/mappers/hosts_mapper.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c13e648f/ambari-web/app/mappers/hosts_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/hosts_mapper.js b/ambari-web/app/mappers/hosts_mapper.js
index f09da5d..4ce260c 100644
--- a/ambari-web/app/mappers/hosts_mapper.js
+++ b/ambari-web/app/mappers/hosts_mapper.js
@@ -111,7 +111,8 @@ App.hostsMapper = App.QuickDataMapper.create({
if (App.get('supports.stackUpgrade')) {
var currentVersion = item.stack_versions.findProperty('HostStackVersions.state', 'CURRENT');
- var currentVersionNumber = Em.get(currentVersion.repository_versions[0], 'RepositoryVersions.repository_version');
+ var currentVersionNumber = currentVersion && currentVersion.repository_versions
+ ? Em.get(currentVersion.repository_versions[0], 'RepositoryVersions.repository_version') : '';
item.stack_versions.forEach(function (stackVersion) {
stackVersion.host_name = item.Hosts.host_name;
stackVersion.is_visible = stringUtils.compareVersions(Em.get(stackVersion.repository_versions[0], 'RepositoryVersions.repository_version'), currentVersionNumber) >= 0