cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject [2/2] git commit: updated refs/heads/master to 48574f2
Date Thu, 03 Jul 2014 00:50:29 GMT
CLOUDSTACK-7047: DeploymentPlanner should include disabled resources only when the VM owner
is Admin account

Changes:
- removing unused imports


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

Branch: refs/heads/master
Commit: 48574f2d606ebddb358457301a3dbaa896e9595c
Parents: 9f68870
Author: Prachi Damle <prachi.damle@citrix.com>
Authored: Wed Jul 2 17:24:29 2014 -0700
Committer: Prachi Damle <prachi.damle@citrix.com>
Committed: Wed Jul 2 17:49:53 2014 -0700

----------------------------------------------------------------------
 server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 1 -
 server/src/com/cloud/deploy/FirstFitPlanner.java               | 1 -
 2 files changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48574f2d/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index d6f87b9..bb94b76 100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -120,7 +120,6 @@ import com.cloud.utils.db.TransactionStatus;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.fsm.StateListener;
 import com.cloud.vm.DiskProfile;
-import com.cloud.vm.ReservationContext;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.Event;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48574f2d/server/src/com/cloud/deploy/FirstFitPlanner.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java
index 8592456..48780a7 100755
--- a/server/src/com/cloud/deploy/FirstFitPlanner.java
+++ b/server/src/com/cloud/deploy/FirstFitPlanner.java
@@ -56,7 +56,6 @@ import com.cloud.storage.dao.VolumeDao;
 import com.cloud.user.AccountManager;
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.Pair;
-import com.cloud.vm.ReservationContext;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.dao.UserVmDao;


Mime
View raw message