cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject git commit: updated refs/heads/object_store to 4611b51
Date Thu, 23 May 2013 18:03:13 GMT
Updated Branches:
  refs/heads/object_store 755b9311a -> 4611b515d


Not passing format to VolumeDataStore due to removal of format column
from volume_store_ref.

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

Branch: refs/heads/object_store
Commit: 4611b515db1368c43787bf9843008e522f9519a0
Parents: 755b931
Author: Min Chen <min.chen@citrix.com>
Authored: Thu May 23 11:02:49 2013 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Thu May 23 11:02:49 2013 -0700

----------------------------------------------------------------------
 .../storage/datastore/db/VolumeDataStoreVO.java    |    2 +-
 .../storage/download/DownloadMonitorImpl.java      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4611b515/engine/api/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
b/engine/api/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
index 2d72922..7e89de4 100755
--- a/engine/api/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
+++ b/engine/api/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
@@ -205,7 +205,7 @@ public class VolumeDataStoreVO implements StateObject<ObjectInDataStoreStateMach
 	public VolumeDataStoreVO(long hostId, long volumeId, Date lastUpdated,
 			int downloadPercent, Status downloadState,
 			String localDownloadPath, String errorString, String jobId,
-			String installPath, String downloadUrl, String checksum, ImageFormat format) {
+			String installPath, String downloadUrl, String checksum) {
 		//super();
 		this.dataStoreId = hostId;
 		this.volumeId = volumeId;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4611b515/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
index eace673..f5ce55f 100755
--- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
+++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
@@ -232,7 +232,7 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor
         volumeHost = _volumeStoreDao.findByStoreVolume(store.getId(), volume.getId());
         if (volumeHost == null) {
             volumeHost = new VolumeDataStoreVO(store.getId(), volume.getId(), new Date(),
0, Status.NOT_DOWNLOADED,
-                    null, null, "jobid0000", null, url, checkSum, format);
+                    null, null, "jobid0000", null, url, checkSum);
             _volumeStoreDao.persist(volumeHost);
         } else if ((volumeHost.getJobId() != null) && (volumeHost.getJobId().length()
> 2)) {
             downloadJobExists = true;


Mime
View raw message