You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mt...@apache.org on 2015/05/07 21:53:29 UTC
[1/2] git commit: updated refs/heads/master to ac2bccd
Repository: cloudstack
Updated Branches:
refs/heads/master a9e07691a -> ac2bccd2a
Pass on all operations to CloudStackPrimaryDataStoreDriverImpl
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bcd227fb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bcd227fb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bcd227fb
Branch: refs/heads/master
Commit: bcd227fb6b0472c34be06c02b55518fd2d1dcee6
Parents: a9e0769
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Thu May 7 12:21:35 2015 -0600
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Thu May 7 12:24:05 2015 -0600
----------------------------------------------------------------------
.../SolidFireSharedPrimaryDataStoreDriver.java | 45 --------------------
1 file changed, 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bcd227fb/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFireSharedPrimaryDataStoreDriver.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFireSharedPrimaryDataStoreDriver.java b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFireSharedPrimaryDataStoreDriver.java
index a16408e..365533c 100644
--- a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFireSharedPrimaryDataStoreDriver.java
+++ b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFireSharedPrimaryDataStoreDriver.java
@@ -16,50 +16,5 @@
// under the License.
package org.apache.cloudstack.storage.datastore.driver;
-import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult;
-import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
-import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
-import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
-import org.apache.cloudstack.storage.command.CommandResult;
-
-import com.cloud.agent.api.to.DataStoreTO;
-import com.cloud.agent.api.to.DataTO;
-
public class SolidFireSharedPrimaryDataStoreDriver extends CloudStackPrimaryDataStoreDriverImpl {
- @Override
- public DataTO getTO(DataObject data) {
- return null;
- }
-
- @Override
- public DataStoreTO getStoreTO(DataStore store) {
- return null;
- }
-
- @Override
- public boolean canCopy(DataObject srcData, DataObject destData) {
- return false;
- }
-
- @Override
- public void copyAsync(DataObject srcdata, DataObject destData, AsyncCompletionCallback<CopyCommandResult> callback) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void resize(DataObject data, AsyncCompletionCallback<CreateCmdResult> callback) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void takeSnapshot(SnapshotInfo snapshot, AsyncCompletionCallback<CreateCmdResult> callback) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void revertSnapshot(SnapshotInfo snapshot, AsyncCompletionCallback<CommandResult> callback) {
- throw new UnsupportedOperationException();
- }
}
[2/2] git commit: updated refs/heads/master to ac2bccd
Posted by mt...@apache.org.
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/ac2bccd2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ac2bccd2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ac2bccd2
Branch: refs/heads/master
Commit: ac2bccd2a2b2cf5d11de92ded7bdf2cea6060ce2
Parents: bcd227f
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Thu May 7 12:35:18 2015 -0600
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Thu May 7 13:52:25 2015 -0600
----------------------------------------------------------------------
.../cloudstack/storage/volume/VolumeServiceImpl.java | 1 -
.../com/cloud/baremetal/manager/BaremetalManagerImpl.java | 10 ----------
.../com/cloud/deploy/DeploymentPlanningManagerImpl.java | 1 -
server/src/com/cloud/vm/UserVmManagerImpl.java | 2 --
4 files changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ac2bccd2/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 96771d1..a2fd656 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -83,7 +83,6 @@ import com.cloud.host.Host;
import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.DataStoreRole;
-import com.cloud.storage.RegisterVolumePayload;
import com.cloud.storage.ScopeType;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.StoragePool;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ac2bccd2/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
index 85f79e3..f826ae9 100644
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
@@ -42,19 +42,9 @@ import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.fsm.StateListener;
-import com.cloud.utils.fsm.StateMachine2;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.Event;
import com.cloud.vm.VirtualMachine.State;
-import org.apache.cloudstack.api.AddBaremetalHostCmd;
-import org.apache.log4j.Logger;
-
-import javax.ejb.Local;
-import javax.inject.Inject;
-import javax.naming.ConfigurationException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
@Local(value = {BaremetalManager.class})
public class BaremetalManagerImpl extends ManagerBase implements BaremetalManager, StateListener<State, VirtualMachine.Event, VirtualMachine> {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ac2bccd2/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 9d40b6f..3a7173b 100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -123,7 +123,6 @@ 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.utils.fsm.StateMachine2;
import com.cloud.vm.DiskProfile;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ac2bccd2/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 5bee109..4b043a3 100644
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -88,8 +88,6 @@ import org.apache.cloudstack.storage.command.DeleteCommand;
import org.apache.cloudstack.storage.command.DettachCommand;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
-import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;