Repository: ambari Updated Branches: refs/heads/branch-2.2 0c270f9d1 -> df57410ef
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/df57410e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/df57410e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/df57410e Branch: refs/heads/branch-2.2 Commit: df57410ef10d330b4e8da2c734069494ce432688 Parents: 0c270f9 Author: Dmytro Sen <[email protected]> Authored: Sat Apr 9 16:05:06 2016 +0300 Committer: Dmytro Sen <[email protected]> Committed: Sat Apr 9 16:08:45 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/df57410e/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 8cb349a..fc0e6b2 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 @@ -581,7 +581,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/df57410e/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 54a0f0e..cc5a04d 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 @@ -753,8 +753,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();
