Updated Branches: refs/heads/object_store 1df4cf839 -> cf4334454
Fix build error Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cf433445 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cf433445 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cf433445 Branch: refs/heads/object_store Commit: cf43344541c750a877775b0efb4acf1dca5fd00b Parents: 1df4cf8 Author: Min Chen <[email protected]> Authored: Mon Jun 17 13:48:02 2013 -0700 Committer: Min Chen <[email protected]> Committed: Mon Jun 17 13:48:02 2013 -0700 ---------------------------------------------------------------------- engine/schema/src/com/cloud/storage/S3VO.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf433445/engine/schema/src/com/cloud/storage/S3VO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/S3VO.java b/engine/schema/src/com/cloud/storage/S3VO.java index 6b2c23f..e30da0c 100644 --- a/engine/schema/src/com/cloud/storage/S3VO.java +++ b/engine/schema/src/com/cloud/storage/S3VO.java @@ -30,6 +30,7 @@ import javax.persistence.Table; 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 class S3VO implements S3 { } 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); }
