cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [2/2] git commit: updated refs/heads/object_store to 50066a6
Date Thu, 02 May 2013 00:38:21 GMT
Some code cleanup.

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

Branch: refs/heads/object_store
Commit: 50066a602be33a996e44c82efea2928b433020f0
Parents: 2812873
Author: Min Chen <min.chen@citrix.com>
Authored: Wed May 1 17:37:59 2013 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Wed May 1 17:37:59 2013 -0700

----------------------------------------------------------------------
 .../configuration/ConfigurationManagerImpl.java    |    4 ----
 server/src/com/cloud/server/StatsCollector.java    |    4 ----
 2 files changed, 0 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50066a60/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index bf87b18..873ea10 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -104,7 +104,6 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.host.HostVO;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.network.Network;
 import com.cloud.network.Network.Capability;
@@ -147,7 +146,6 @@ import com.cloud.storage.dao.DiskOfferingDao;
 import com.cloud.storage.dao.S3Dao;
 import com.cloud.storage.dao.SwiftDao;
 import com.cloud.storage.s3.S3Manager;
-import com.cloud.storage.secondary.SecondaryStorageVmManager;
 import com.cloud.storage.swift.SwiftManager;
 import com.cloud.test.IPRangeConfig;
 import com.cloud.user.Account;
@@ -232,8 +230,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
     @Inject
     ProjectManager _projectMgr;
     @Inject
-    SecondaryStorageVmManager _ssvmMgr;
-    @Inject
     DataStoreManager _dataStoreMgr;
     @Inject
     NetworkOfferingServiceMapDao _ntwkOffServiceMapDao;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50066a60/server/src/com/cloud/server/StatsCollector.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java
index 90491a5..1398672 100755
--- a/server/src/com/cloud/server/StatsCollector.java
+++ b/server/src/com/cloud/server/StatsCollector.java
@@ -27,7 +27,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
@@ -60,7 +59,6 @@ import com.cloud.host.HostStats;
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
 import com.cloud.host.dao.HostDao;
-import com.cloud.resource.ResourceManager;
 import com.cloud.resource.ResourceState;
 import com.cloud.storage.StorageManager;
 import com.cloud.storage.StoragePoolHostVO;
@@ -69,7 +67,6 @@ import com.cloud.storage.VolumeStats;
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.StoragePoolHostDao;
 import com.cloud.storage.dao.VolumeDao;
-import com.cloud.storage.secondary.SecondaryStorageVmManager;
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.component.ComponentMethodInterceptable;
 import com.cloud.utils.component.ManagerBase;
@@ -100,7 +97,6 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
 	@Inject private ImageStoreDao _imageStoreDao;
 	@Inject private StorageManager _storageManager;
 	@Inject private StoragePoolHostDao _storagePoolHostDao;
-	@Inject private SecondaryStorageVmManager _ssvmMgr;
 	@Inject private DataStoreManager _dataStoreMgr;
 	@Inject private ResourceManager _resourceMgr;
     @Inject private ConfigurationDao _configDao;


Mime
View raw message