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 648CF117BB for ; Mon, 25 Aug 2014 23:19:09 +0000 (UTC) Received: (qmail 1827 invoked by uid 500); 25 Aug 2014 23:19:09 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 1788 invoked by uid 500); 25 Aug 2014 23:19:09 -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 1776 invoked by uid 99); 25 Aug 2014 23:19:09 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Aug 2014 23:19:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BA16DA02CD8; Mon, 25 Aug 2014 23:19:08 +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: <8cf034eb1d234f2fa7ed6bd99e81ed8a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 902a9c5 Date: Mon, 25 Aug 2014 23:19:08 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 68b95aec0 -> 902a9c5b7 CLOUDSTACK-7266: Deleting account is not cleaning the snapshot entries in secondary storage. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/902a9c5b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/902a9c5b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/902a9c5b Branch: refs/heads/master Commit: 902a9c5b70aef32586f037a4b9be56e9538edab4 Parents: 68b95ae Author: Min Chen Authored: Thu Aug 21 18:00:32 2014 -0700 Committer: Min Chen Committed: Mon Aug 25 16:09:48 2014 -0700 ---------------------------------------------------------------------- .../cloudstack/storage/resource/NfsSecondaryStorageResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/902a9c5b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java ---------------------------------------------------------------------- diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java index d8b19d3..c0b4da0 100755 --- a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java +++ b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java @@ -1525,7 +1525,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S private String deleteLocalFile(String fullPath) { Script command = new Script("/bin/bash", s_logger); command.add("-c"); - command.add("rm -f " + fullPath); + command.add("rm -rf " + fullPath); String result = command.execute(); if (result != null) { String errMsg = "Failed to delete file " + fullPath + ", err=" + result;