Updated Branches: refs/heads/object_store 0d580ccb2 -> fdb523d21
Remove a debug code. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fdb523d2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fdb523d2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fdb523d2 Branch: refs/heads/object_store Commit: fdb523d2195273eaf3e7e04fe04435b4a1d73833 Parents: 0d580cc Author: Min Chen <min.c...@citrix.com> Authored: Sun May 12 00:01:44 2013 -0700 Committer: Min Chen <min.c...@citrix.com> Committed: Sun May 12 00:01:44 2013 -0700 ---------------------------------------------------------------------- .../resource/LocalNfsSecondaryStorageResource.java | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fdb523d2/services/secondary-storage/src/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResource.java ---------------------------------------------------------------------- diff --git a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResource.java b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResource.java index bce01ae..53c96dd 100644 --- a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResource.java +++ b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResource.java @@ -28,6 +28,7 @@ import com.cloud.agent.api.to.S3TO; import com.cloud.agent.api.to.SwiftTO; import com.cloud.storage.JavaStorageLayer; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; + import org.apache.cloudstack.storage.template.DownloadManagerImpl; import org.apache.cloudstack.storage.template.DownloadManagerImpl.ZfsPathParser; import com.cloud.utils.S3Utils; @@ -45,16 +46,6 @@ public class LocalNfsSecondaryStorageResource extends NfsSecondaryStorageResourc ((DownloadManagerImpl) _dlMgr).setThreadPool(Executors.newFixedThreadPool(10)); _storage = new JavaStorageLayer(); this._inSystemVM = false; - System.setProperty("paths.script", "/Users/minc/dev/cloud-asf"); // This - // is - // just - // for - // my - // testing, - // not - // for - // QA - // build } @Override
