Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward 63c4f0289 -> 40e28de72
CLOUDSTACK-7047: DeploymentPlanner should include disabled resources only when
the VM owner is Admin account
Changes:
- removing unused imports
Conflicts:
server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f37b1524
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f37b1524
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f37b1524
Branch: refs/heads/4.4-forward
Commit: f37b1524892ab805615dbff2c59e5a1d10c116d3
Parents: 63c4f02
Author: Prachi Damle <[email protected]>
Authored: Wed Jul 2 17:24:29 2014 -0700
Committer: Prachi Damle <[email protected]>
Committed: Wed Jul 2 17:56:39 2014 -0700
----------------------------------------------------------------------
.../com/cloud/deploy/DeploymentPlanningManagerImpl.java | 11 +++++------
server/src/com/cloud/deploy/FirstFitPlanner.java | 1 -
2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f37b1524/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 c2a5ff5..aa3e6e1 100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -118,12 +118,11 @@ import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionCallback;
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;
+import com.cloud.utils.fsm.StateListener;
+import com.cloud.vm.DiskProfile;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachine.Event;
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.UserVmDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f37b1524/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 6ffe31f..1c3a9f1 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;
