Repository: ambari Updated Branches: refs/heads/trunk 03d2cdb45 -> 1be0e6c8f
AMBARI-15759 No Storm widgets after ugprading to Ambari 2.2.1.1 (additional patch) (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1be0e6c8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1be0e6c8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1be0e6c8 Branch: refs/heads/trunk Commit: 1be0e6c8f509dd48fca5727f1fccb07428b42de7 Parents: 03d2cdb Author: Dmytro Sen <[email protected]> Authored: Sat Apr 9 16:05:06 2016 +0300 Committer: Dmytro Sen <[email protected]> Committed: Sat Apr 9 16:05:06 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java | 1 - .../org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java | 2 -- 2 files changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1be0e6c8/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java index 8eab182..c958632 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java @@ -582,7 +582,6 @@ public class UpgradeCatalog222 extends AbstractUpgradeCatalog { if (clusterMap != null && !clusterMap.isEmpty()) { for (Cluster cluster : clusterMap.values()) { - controller.initializeWidgetsAndLayouts(cluster, null); Map<String, Service> serviceMap = cluster.getServices(); if (serviceMap != null && !serviceMap.isEmpty()) { http://git-wip-us.apache.org/repos/asf/ambari/blob/1be0e6c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java index 92b753c..4b73022 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java @@ -751,8 +751,6 @@ public class UpgradeCatalog222Test { expect(controller.getClusters()).andReturn(clusters).anyTimes(); expect(clusters.getClusters()).andReturn(clusterMap).anyTimes(); - controller.initializeWidgetsAndLayouts(cluster, null); - expectLastCall().once(); expect(cluster.getServices()).andReturn(services).once(); expect(stormService.getName()).andReturn(stormServiceName).atLeastOnce();
