Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 724EFF519 for ; Wed, 8 May 2013 00:59:15 +0000 (UTC) Received: (qmail 4217 invoked by uid 500); 8 May 2013 00:59:15 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 4178 invoked by uid 500); 8 May 2013 00:59:15 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 4171 invoked by uid 99); 8 May 2013 00:59:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 May 2013 00:59:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C962788937D; Wed, 8 May 2013 00:59:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: commits@cloudstack.apache.org Message-Id: <81ff044ad1324ea29ba93caf19146a20@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/object_store to ac1b75d Date: Wed, 8 May 2013 00:59:14 +0000 (UTC) Updated Branches: refs/heads/object_store 8a514ea4b -> ac1b75dc9 Fix a bug in deleteTemplate return result. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ac1b75dc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ac1b75dc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ac1b75dc Branch: refs/heads/object_store Commit: ac1b75dc9f212ba97f1acf6759151cd8d3f0ff10 Parents: 8a514ea Author: Min Chen Authored: Tue May 7 17:58:45 2013 -0700 Committer: Min Chen Committed: Tue May 7 17:58:45 2013 -0700 ---------------------------------------------------------------------- .../driver/CloudStackImageStoreDriverImpl.java | 2 +- .../datastore/driver/S3ImageStoreDriverImpl.java | 2 +- .../driver/SwiftImageStoreDriverImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ac1b75dc/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java ---------------------------------------------------------------------- diff --git a/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java b/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java index 8e9572c..84c5ea5 100644 --- a/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java +++ b/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java @@ -299,7 +299,7 @@ public class CloudStackImageStoreDriverImpl implements ImageStoreDriver { } else { s_logger.debug("Deleted template at: " + installPath); CommandResult result = new CommandResult(); - result.setSucess(false); + result.setSucess(true); callback.complete(result); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ac1b75dc/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java ---------------------------------------------------------------------- diff --git a/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java b/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java index b1d2f95..354151e 100644 --- a/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java +++ b/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java @@ -311,7 +311,7 @@ public class S3ImageStoreDriverImpl implements ImageStoreDriver { } else { s_logger.debug("Deleted template at: " + installPath); CommandResult result = new CommandResult(); - result.setSucess(false); + result.setSucess(true); callback.complete(result); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ac1b75dc/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java ---------------------------------------------------------------------- diff --git a/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java b/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java index bbda45c..0eb3acf 100644 --- a/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java +++ b/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java @@ -302,7 +302,7 @@ public class SwiftImageStoreDriverImpl implements ImageStoreDriver { } else { s_logger.debug("Deleted template at: " + installPath); CommandResult result = new CommandResult(); - result.setSucess(false); + result.setSucess(true); callback.complete(result); }