cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [1/2] git commit: updated refs/heads/object_store to 8a95620
Date Wed, 22 May 2013 21:35:38 GMT
Updated Branches:
  refs/heads/object_store eb0a7489b -> 8a956203d


ListImageStores still show those deleted image stores.


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

Branch: refs/heads/object_store
Commit: 8a956203d146a7fc6387f69d4fe7943c239f1986
Parents: 0390984
Author: Min Chen <min.chen@citrix.com>
Authored: Wed May 22 14:32:51 2013 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Wed May 22 14:33:40 2013 -0700

----------------------------------------------------------------------
 .../com/cloud/api/query/vo/ImageStoreJoinVO.java   |   15 +++++++++++++++
 setup/db/db/schema-410to420.sql                    |    1 +
 2 files changed, 16 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a956203/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java b/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java
index 7014e05..ac161af 100644
--- a/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java
@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.api.query.vo;
 
+import java.util.Date;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -26,6 +28,8 @@ import javax.persistence.Table;
 import com.cloud.storage.DataStoreRole;
 import com.cloud.storage.ImageStore;
 import com.cloud.storage.ScopeType;
+import com.cloud.utils.db.GenericDao;
+
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
@@ -79,6 +83,8 @@ public class ImageStoreJoinVO extends BaseViewVO implements InternalIdentity,
Id
     @Column(name="detail_value")
     private String detailValue;
 
+    @Column(name=GenericDao.REMOVED_COLUMN)
+    private Date removed;
 
     @Override
     public long getId() {
@@ -189,4 +195,13 @@ public class ImageStoreJoinVO extends BaseViewVO implements InternalIdentity,
Id
         this.role = role;
     }
 
+    public Date getRemoved() {
+        return removed;
+    }
+
+    public void setRemoved(Date removed) {
+        this.removed = removed;
+    }
+
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a956203/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index babe25e..5ddf3b6 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -110,6 +110,7 @@ CREATE VIEW `cloud`.`image_store_view` AS
         image_store.url,
         image_store.scope,
         image_store.role,
+        image_store.removed,
         data_center.id data_center_id,
         data_center.uuid data_center_uuid,
         data_center.name data_center_name,


Mime
View raw message