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 84FD41143F for ; Thu, 17 Jul 2014 08:10:56 +0000 (UTC) Received: (qmail 38929 invoked by uid 500); 17 Jul 2014 08:10:46 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 38852 invoked by uid 500); 17 Jul 2014 08:10:46 -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 38084 invoked by uid 99); 17 Jul 2014 08:10:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jul 2014 08:10:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BA8D199BEA2; Thu, 17 Jul 2014 08:10:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hugo@apache.org To: commits@cloudstack.apache.org Date: Thu, 17 Jul 2014 08:11:02 -0000 Message-Id: In-Reply-To: <8d6dd2d2bad84c6a934ecbe0f86003e0@git.apache.org> References: <8d6dd2d2bad84c6a934ecbe0f86003e0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/39] git commit: updated refs/heads/vpc-toolkit-hugo to 34bed5f Adding missing modified file Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/33d6bc27 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/33d6bc27 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/33d6bc27 Branch: refs/heads/vpc-toolkit-hugo Commit: 33d6bc278f9645e7ab9942f508971669414538f0 Parents: 3d8dd1c Author: amoghvk Authored: Mon Jul 14 17:42:27 2014 -0700 Committer: amoghvk Committed: Mon Jul 14 17:42:27 2014 -0700 ---------------------------------------------------------------------- .../cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33d6bc27/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java ---------------------------------------------------------------------- diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java index c5c54df..17a9f79 100644 --- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java +++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java @@ -353,7 +353,6 @@ public class DefaultVMSnapshotStrategy extends ManagerBase implements VMSnapshot RevertToVMSnapshotCommand revertToSnapshotCommand = new RevertToVMSnapshotCommand(vmInstanceName, vmSnapshotTO, volumeTOs, guestOS.getDisplayName()); HostVO host = hostDao.findById(hostId); GuestOSHypervisorVO guestOsMapping = guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), host.getHypervisorType().toString(), host.getHypervisorVersion()); - RevertToVMSnapshotCommand revertToSnapshotCommand = new RevertToVMSnapshotCommand(vmInstanceName, vmSnapshotTO, volumeTOs, guestOS.getDisplayName()); if (guestOsMapping == null) { revertToSnapshotCommand.setPlatformEmulator(null); } else {