Skip to content

Commit c543cb3

Browse files
rebase fixes
1 parent 3f400a4 commit c543cb3

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/ScaleIOPrimaryDataStoreLifeCycle.java

+3-8
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,13 @@
2424
import java.net.URLDecoder;
2525
import java.security.KeyManagementException;
2626
import java.security.NoSuchAlgorithmException;
27-
import java.util.ArrayList;
2827
import java.util.HashMap;
2928
import java.util.List;
3029
import java.util.Map;
3130
import java.util.UUID;
3231

3332
import javax.inject.Inject;
3433

35-
import org.apache.cloudstack.storage.datastore.client.ScaleIOGatewayClientConnectionPool;
36-
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
37-
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
38-
import org.apache.cloudstack.storage.datastore.manager.ScaleIOSDCManager;
39-
import org.apache.cloudstack.storage.datastore.manager.ScaleIOSDCManagerImpl;
40-
import org.apache.cloudstack.storage.datastore.util.ScaleIOUtil;
41-
import org.apache.commons.collections.CollectionUtils;
4234
import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope;
4335
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
4436
import org.apache.cloudstack.engine.subsystem.api.storage.HostScope;
@@ -50,8 +42,11 @@
5042
import org.apache.cloudstack.storage.datastore.client.ScaleIOGatewayClient;
5143
import org.apache.cloudstack.storage.datastore.client.ScaleIOGatewayClientConnectionPool;
5244
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
45+
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
5346
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
5447
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
48+
import org.apache.cloudstack.storage.datastore.manager.ScaleIOSDCManager;
49+
import org.apache.cloudstack.storage.datastore.manager.ScaleIOSDCManagerImpl;
5550
import org.apache.cloudstack.storage.datastore.util.ScaleIOUtil;
5651
import org.apache.cloudstack.storage.volume.datastore.PrimaryDataStoreHelper;
5752
import org.apache.commons.collections.CollectionUtils;

0 commit comments

Comments
 (0)