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/11/13 10:27:39 UTC

[1/2] ambari git commit: AMBARI-13873 During ranger plugins enabling warning about dependent properties is placed incorrectly. (ababiichuk)

Repository: ambari
Updated Branches:
  refs/heads/trunk 5d2b2a4ad -> 74a563bec


AMBARI-13873 During ranger plugins enabling warning about dependent properties is placed incorrectly. (ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0e990b95
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0e990b95
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0e990b95

Branch: refs/heads/trunk
Commit: 0e990b9525f6d6b2f62b55cce340c1569b4120e4
Parents: 5d2b2a4
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Fri Nov 13 11:16:10 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Nov 13 11:16:10 2015 +0200

----------------------------------------------------------------------
 ambari-web/app/views/main/service/info/configs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0e990b95/ambari-web/app/views/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/info/configs.js b/ambari-web/app/views/main/service/info/configs.js
index 5a5bb25..45faeaa 100644
--- a/ambari-web/app/views/main/service/info/configs.js
+++ b/ambari-web/app/views/main/service/info/configs.js
@@ -91,7 +91,7 @@ App.MainServiceInfoConfigsView = Em.View.extend({
       Em.run.next(function () {
         $(".dependencies-info-bar-wrapper").stick_in_parent({parent: '#serviceConfig', offset_top: 60});
         Em.run.next(function () {
-          $(window).scrollTop(window.scrollY + 1); // '.dependencies-info-bar-wrapper' position should be recalculated
+          $(".dependencies-info-bar-wrapper").trigger("sticky_kit:recalc"); // '.dependencies-info-bar-wrapper' position should be recalculated
         });
       });
     }


[2/2] ambari git commit: AMBARI-13874 On Kerberos Service Config page "hull host" is shown in KDC category. (ababiichuk)

Posted by ab...@apache.org.
AMBARI-13874 On Kerberos Service Config page "hull host" is shown in KDC category. (ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/74a563be
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/74a563be
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/74a563be

Branch: refs/heads/trunk
Commit: 74a563bec01dae31a3746e74f350d02c04284edb
Parents: 0e990b9
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Fri Nov 13 11:24:46 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Nov 13 11:24:46 2015 +0200

----------------------------------------------------------------------
 ambari-web/app/models/stack_service.js              | 2 +-
 ambari-web/app/views/common/quick_view_link_view.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/74a563be/ambari-web/app/models/stack_service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js
index 86b44ad..1926b9c 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -335,7 +335,7 @@ App.StackService.configCategories = function () {
       break;
     case 'KERBEROS':
       serviceConfigCategories.pushObjects([
-        App.ServiceConfigCategory.create({ name: 'KDC', displayName: 'KDC', showHost: true}),
+        App.ServiceConfigCategory.create({ name: 'KDC', displayName: 'KDC'}),
         App.ServiceConfigCategory.create({ name: 'Kadmin', displayName: 'Kadmin'}),
         App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'})
       ]);

http://git-wip-us.apache.org/repos/asf/ambari/blob/74a563be/ambari-web/app/views/common/quick_view_link_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/quick_view_link_view.js b/ambari-web/app/views/common/quick_view_link_view.js
index adc1695..23e63ba 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -396,7 +396,7 @@ App.QuickViewLinks = Em.View.extend({
         hosts = this.findHosts('ATLAS_SERVER', response);
         break;
       default:
-        if (this.get('content.hostComponents').someProperty('isMaster')) {
+        if (this.getWithDefault('content.hostComponents', []).someProperty('isMaster')) {
           hosts = this.findHosts(this.get('content.hostComponents').findProperty('isMaster').get('componentName'), response);
         }
         break;