From 1a0415601fcbf593952aade52836cd71da4b9f63 Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Tue, 17 Aug 2010 10:00:09 -0700
Subject: [PATCH] Incremental checkin

---
 server/src/com/cloud/server/ManagementServer.java     | 4 ++--
 server/src/com/cloud/server/ManagementServerImpl.java | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/server/ManagementServer.java b/server/src/com/cloud/server/ManagementServer.java
index 5583a0d2895..3157573c246 100644
--- a/server/src/com/cloud/server/ManagementServer.java
+++ b/server/src/com/cloud/server/ManagementServer.java
@@ -732,8 +732,8 @@ public interface ManagementServer {
      * @param serviceOfferingId
      * @return success/failure
      */
-    boolean upgradeVirtualMachine(long userId, long vmId, long serviceOfferingId, long startEventId);
-    long upgradeVirtualMachineAsync(long userId, long vmId, long serviceOfferingId) throws InvalidParameterValueException;
+//    boolean upgradeVirtualMachine(long userId, long vmId, long serviceOfferingId, long startEventId);
+//    long upgradeVirtualMachineAsync(long userId, long vmId, long serviceOfferingId) throws InvalidParameterValueException;
     
     
     /**
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 5b5bfcf610c..44ffef72784 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -2611,6 +2611,7 @@ public class ManagementServerImpl implements ManagementServer {
         return _vmMgr.recoverVirtualMachine(vmId);
     }
 
+    /*
     @Override
     public boolean upgradeVirtualMachine(long userId, long vmId, long serviceOfferingId,long startEventId) {
         UserVmVO userVm = _userVmDao.findById(vmId);
@@ -2701,6 +2702,7 @@ public class ManagementServerImpl implements ManagementServer {
         
         return _asyncMgr.submitAsyncJob(job, true);
     }
+*/
 
     @Override
     public void updateVirtualMachine(long vmId, String displayName, String group, boolean enable, Long userId, long accountId) {