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 1F68410EF0 for ; Tue, 13 Aug 2013 05:49:02 +0000 (UTC) Received: (qmail 70543 invoked by uid 500); 13 Aug 2013 05:49:01 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 70355 invoked by uid 500); 13 Aug 2013 05:49:00 -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 69898 invoked by uid 99); 13 Aug 2013 05:48:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Aug 2013 05:48:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 330A08BD4E6; Tue, 13 Aug 2013 05:48:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: likithas@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.2 to 15b40e5 Date: Tue, 13 Aug 2013 05:48:59 +0000 (UTC) Updated Branches: refs/heads/4.2 314c6579a -> 15b40e5cf CLOUDSTACK-4273. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/15b40e5c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/15b40e5c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/15b40e5c Branch: refs/heads/4.2 Commit: 15b40e5cf2234588e75b09e100585ab390a8dbbd Parents: 314c657 Author: Likitha Shetty Authored: Tue Aug 13 11:13:42 2013 +0530 Committer: Likitha Shetty Committed: Tue Aug 13 11:14:32 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/storage/VolumeManagerImpl.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15b40e5c/server/src/com/cloud/storage/VolumeManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/VolumeManagerImpl.java b/server/src/com/cloud/storage/VolumeManagerImpl.java index 62d57f7..e099748 100644 --- a/server/src/com/cloud/storage/VolumeManagerImpl.java +++ b/server/src/com/cloud/storage/VolumeManagerImpl.java @@ -1852,9 +1852,6 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager { boolean createVolumeOnBackend = true; if (rootVolumeOfVm.getState() == Volume.State.Allocated) { createVolumeOnBackend = false; - if(isVolumeOnSec) { - throw new CloudRuntimeException("Cant attach uploaded volume to the vm which is not created. Please start it and then retry"); - } } // Create volume on the backend only when VM's root volume is allocated