[2/2] git commit: updated refs/heads/4.4 to 29b09b1

[dahn]

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

(cherry picked from commit f37b1524892ab805615dbff2c59e5a1d10c116d3)


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

Branch: refs/heads/4.4
Commit: 29b09b1e21132d1c6c2739dbd0df99d895aef039
Parents: b70bd23
Author: Prachi Damle <prachi.da...@citrix.com>
Authored: Wed Jul 2 17:24:29 2014 -0700
Committer: Daan Hoogland <d...@onecht.net>
Committed: Thu Jul 3 16:13:15 2014 +0200

----------------------------------------------------------------------
 .../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/29b09b1e/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 c61e507..8589b1a 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/29b09b1e/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 cd093f3..c29101d 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;