gitqueue
diff --git a/‎engine/schema/src/com/cloud/storage/S3VO.java‎
Lines changed: 2 additions & 1 deletion b/‎engine/schema/src/com/cloud/storage/S3VO.java‎
Lines changed: 2 additions & 1 deletion
@@ -30,6 +30,7 @@
 import com.cloud.agent.api.to.S3TO;
 import com.cloud.utils.db.GenericDao;
 
+//TODO: this will be removed after object_store merge.
 @Entity
 @Table(name = "s3")
 public class S3VO implements S3 {
@@ -109,7 +110,7 @@ public S3TO toS3TO() {
         }
 
         return new S3TO(this.id, this.uuid, this.accessKey, this.secretKey, this.endPoint, this.bucketName, httpsFlag,
-                this.connectionTimeout, this.maxErrorRetry, this.socketTimeout, this.created);
+                this.connectionTimeout, this.maxErrorRetry, this.socketTimeout, this.created, false);
 
     }
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`import com.cloud.agent.api.to.S3TO;`
`31`	`31`	`import com.cloud.utils.db.GenericDao;`
`32`	`32`
	`33`	`+//TODO: this will be removed after object_store merge.`
`33`	`34`	`@Entity`
`34`	`35`	`@Table(name = "s3")`
`35`	`36`	`public class S3VO implements S3 {`
`@@ -109,7 +110,7 @@ public S3TO toS3TO() {`
`109`	`110`	`}`
`110`	`111`
`111`	`112`	`return new S3TO(this.id, this.uuid, this.accessKey, this.secretKey, this.endPoint, this.bucketName, httpsFlag,`
`112`		`- this.connectionTimeout, this.maxErrorRetry, this.socketTimeout, this.created);`
	`113`	`+ this.connectionTimeout, this.maxErrorRetry, this.socketTimeout, this.created, false);`
`113`	`114`
`114`	`115`	`}`
`115`	`116`