You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/11/05 20:19:27 UTC
git commit: fix build
Updated Branches:
refs/heads/javelin 37197d636 -> 6dd2318b4
fix build
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6dd2318b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6dd2318b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6dd2318b
Branch: refs/heads/javelin
Commit: 6dd2318b443e1a952968dc4b257b39227b2a43ea
Parents: 37197d6
Author: Edison Su <su...@gmail.com>
Authored: Mon Nov 5 11:19:16 2012 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Mon Nov 5 11:19:16 2012 -0800
----------------------------------------------------------------------
.../DefaultNfsSecondaryStorageProvider.java | 4 +---
.../provider/DefaultPrimaryStorageProvider.java | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6dd2318b/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultNfsSecondaryStorageProvider.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultNfsSecondaryStorageProvider.java b/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultNfsSecondaryStorageProvider.java
index a871a32..19ffae8 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultNfsSecondaryStorageProvider.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultNfsSecondaryStorageProvider.java
@@ -32,8 +32,6 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreConfigurator;
import org.apache.cloudstack.engine.subsystem.api.storage.StorageProvider;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore.StoreType;
-import org.apache.cloudstack.storage.datastoreconfigurator.NfsSecondaryStorageConfigurator;
-import org.apache.cloudstack.storage.datastoreconfigurator.XenNfsDataStoreConfigurator;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.hypervisor.Hypervisor;
@@ -45,7 +43,7 @@ public class DefaultNfsSecondaryStorageProvider implements StorageProvider {
protected Map<HypervisorType, Map<String, DataStoreConfigurator>> _supportedProtocols;
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
Map<String, DataStoreConfigurator> dscs = new HashMap<String, DataStoreConfigurator>();
- DataStoreConfigurator nfsdc = new NfsSecondaryStorageConfigurator();
+ DataStoreConfigurator nfsdc = null;
dscs.put(nfsdc.getProtocol(), nfsdc);
_supportedProtocols.put(HypervisorType.XenServer, dscs);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6dd2318b/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultPrimaryStorageProvider.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultPrimaryStorageProvider.java b/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultPrimaryStorageProvider.java
index 40a2823..388b70a 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultPrimaryStorageProvider.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultPrimaryStorageProvider.java
@@ -14,8 +14,6 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreConfigurator;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreLifeCycle;
import org.apache.cloudstack.engine.subsystem.api.storage.StorageProvider;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore.StoreType;
-import org.apache.cloudstack.storage.datastoreconfigurator.NfsDataStoreConfigurator;
-import org.apache.cloudstack.storage.datastoreconfigurator.XenNfsDataStoreConfigurator;
import com.cloud.dc.ClusterVO;
import com.cloud.dc.DataCenterVO;
@@ -45,7 +43,7 @@ public class DefaultPrimaryStorageProvider implements StorageProvider {
public DefaultPrimaryStorageProvider() {
Map<String, DataStoreConfigurator> dscs = new HashMap<String, DataStoreConfigurator>();
- DataStoreConfigurator nfsdc = new XenNfsDataStoreConfigurator();
+ DataStoreConfigurator nfsdc = null;
dscs.put(nfsdc.getProtocol(), nfsdc);
_supportedProtocols.put(HypervisorType.XenServer, dscs);