cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sanjaytripa...@apache.org
Subject git commit: updated refs/heads/4.5 to 80e0c99
Date Thu, 16 Oct 2014 08:21:32 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 53ee4cd79 -> 80e0c9918


Removed duplicate code and unused imports which was causing build failure.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/80e0c991
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/80e0c991
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/80e0c991

Branch: refs/heads/4.5
Commit: 80e0c99189c825989124d19e338346ab65738703
Parents: 53ee4cd
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Thu Oct 16 13:53:32 2014 +0530
Committer: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Committed: Thu Oct 16 13:53:32 2014 +0530

----------------------------------------------------------------------
 .../networkservice/BaremetalKickStartServiceImpl.java |  7 ++-----
 .../src/com/cloud/resource/ResourceManagerImpl.java   | 14 --------------
 2 files changed, 2 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/80e0c991/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
index df06650..2786e13 100755
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
@@ -30,19 +30,16 @@ import java.util.Map;
 import javax.ejb.Local;
 import javax.inject.Inject;
 
-import com.cloud.configuration.Config;
-
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.api.AddBaremetalKickStartPxeCmd;
 import org.apache.cloudstack.api.AddBaremetalPxeCmd;
 import org.apache.cloudstack.api.ListBaremetalPxeServersCmd;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.log4j.Logger;
 
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.baremetal.IpmISetBootDevCommand;
-import com.cloud.agent.api.baremetal.PrepareKickstartPxeServerCommand;
 import com.cloud.agent.api.baremetal.IpmISetBootDevCommand.BootDev;
+import com.cloud.agent.api.baremetal.PrepareKickstartPxeServerCommand;
 import com.cloud.baremetal.database.BaremetalPxeDao;
 import com.cloud.baremetal.database.BaremetalPxeVO;
 import com.cloud.baremetal.networkservice.BaremetalPxeManager.BaremetalPxeType;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/80e0c991/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index 9594770..a0a3adf 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -1631,20 +1631,6 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
                 clusterId = c.getId();
             }
         }
-        StartupRoutingCommand ssCmd = (StartupRoutingCommand)startup;
-        List<String> implicitHostTags = ssCmd.getHostTags();
-        if (!implicitHostTags.isEmpty()) {
-            if (hostTags == null) {
-                hostTags = _hostTagsDao.gethostTags(host.getId());
-            }
-            if (hostTags != null) {
-                implicitHostTags.removeAll(hostTags);
-                hostTags.addAll(implicitHostTags);
-            } else {
-                hostTags = implicitHostTags;
-            }
-        }
-
         if (startup instanceof StartupRoutingCommand) {
             StartupRoutingCommand ssCmd = ((StartupRoutingCommand)startup);
             List<String> implicitHostTags = ssCmd.getHostTags();


Mime
View raw message