ambari git commit: AMBARI-11083. Upgrade 1.6.1 - 2.0.1 - nagios not removed.

2015-05-12 Thread swagle 
Repository: ambari
Updated Branches:
  refs/heads/trunk bd1971616 - 017ae9f0e


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/017ae9f0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/017ae9f0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/017ae9f0

Branch: refs/heads/trunk
Commit: 017ae9f0e4a1e4fbe933168ca9a30499b83c5d3a
Parents: bd19716
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Tue May 12 12:41:25 2015 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Tue May 12 12:41:31 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/017ae9f0/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 9804bca..d2b9610 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
@@ -467,6 +467,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());

ambari git commit: AMBARI-11083. Upgrade 1.6.1 - 2.0.1 - nagios not removed.

2015-05-12 Thread swagle 
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 swa...@hortonworks.com
Authored: Tue May 12 12:44:57 2015 -0700
Committer: Siddharth Wagle swa...@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());