ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject ambari git commit: AMBARI-11083. Upgrade 1.6.1 -> 2.0.1 - nagios not removed.
Date Tue, 12 May 2015 19:45:37 GMT
Repository: ambari
Updated Branches:
  refs/heads/origin/branch-2.0.maint [created] 11695e4fe


AMBARI-11083. Upgrade 1.6.1 -> 2.0.1 - nagios not removed.


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

Branch: refs/heads/origin/branch-2.0.maint
Commit: 11695e4fe531680bf8fcc00c1598664e549c5728
Parents: a21a69e
Author: Siddharth Wagle <swagle@hortonworks.com>
Authored: Tue May 12 12:44:57 2015 -0700
Committer: Siddharth Wagle <swagle@hortonworks.com>
Committed: Tue May 12 12:44:57 2015 -0700

----------------------------------------------------------------------
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java    | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/11695e4f/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
index 4e444b9..1b22c89 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
@@ -489,6 +489,7 @@ public class UpgradeCatalog200 extends AbstractUpgradeCatalog {
         desiredStateDao.remove(serviceDesiredState);
 
         // remove service
+        cluster.getClusterServiceEntities().remove(nagios);
         ClusterServiceEntityPK primaryKey = new ClusterServiceEntityPK();
         primaryKey.setClusterId(nagios.getClusterId());
         primaryKey.setServiceName(nagios.getServiceName());


Mime
View raw message