cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aprat...@apache.org
Subject [50/50] git commit: updated refs/heads/ldapplugin to 1f64354
Date Thu, 25 Jul 2013 11:57:28 GMT
CLOUDSTACK-3712
Use Vminstance instead of user vm for scaling stopped vms.
Signed off by : nitin mehta<nitin.mehta@citrix.com>


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

Branch: refs/heads/ldapplugin
Commit: 1f64354ec830db6e30c17ec6e4a6d8c33f2e10da
Parents: 1744ed7
Author: Nitin Mehta <nitin.mehta@citrix.com>
Authored: Thu Jul 25 14:30:25 2013 +0530
Committer: Nitin Mehta <nitin.mehta@citrix.com>
Committed: Thu Jul 25 14:58:42 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/vm/UserVmManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f64354e/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index ae12523..4603431 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -769,7 +769,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager,
Vir
         Account caller = CallContext.current().getCallingAccount();
 
         // Verify input parameters
-        UserVmVO vmInstance = _vmDao.findById(vmId);
+        //UserVmVO vmInstance = _vmDao.findById(vmId);
+        VMInstanceVO vmInstance = _vmInstanceDao.findById(vmId);
         if (vmInstance == null) {
             throw new InvalidParameterValueException(
                     "unable to find a virtual machine with id " + vmId);


Mime
View raw message