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 0697F11B38 for ; Tue, 2 Sep 2014 18:51:07 +0000 (UTC) Received: (qmail 68187 invoked by uid 500); 2 Sep 2014 18:51:06 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 68154 invoked by uid 500); 2 Sep 2014 18:51:06 -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 68145 invoked by uid 99); 2 Sep 2014 18:51:06 -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, 02 Sep 2014 18:51:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5F1AF9B001C; Tue, 2 Sep 2014 18:51:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mtutkowski@apache.org To: commits@cloudstack.apache.org Message-Id: <3d8240e7373f46678e0d21afb5b79d76@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to ba41f23 Date: Tue, 2 Sep 2014 18:51:06 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master c200ada86 -> ba41f230e CLOUDSTACK-7467 (this part of the ticket is related to augmenting an error message) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ba41f230 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ba41f230 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ba41f230 Branch: refs/heads/master Commit: ba41f230e19e66d108631d92e7c5f1d89083f81f Parents: c200ada Author: Mike Tutkowski Authored: Tue Sep 2 12:50:22 2014 -0600 Committer: Mike Tutkowski Committed: Tue Sep 2 12:51:01 2014 -0600 ---------------------------------------------------------------------- server/src/com/cloud/storage/VolumeApiServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba41f230/server/src/com/cloud/storage/VolumeApiServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java index c662165..16d46e6 100644 --- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java @@ -738,7 +738,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic if (newSize != null) { if (!diskOffering.isCustomized() && !volume.getVolumeType().equals(Volume.Type.ROOT)) { throw new InvalidParameterValueException("To change a volume's size without providing a new disk offering, its current disk offering must be " + - "customizable or it must be a root volume."); + "customizable or it must be a root volume (if providing a disk offering, make sure it is different from the current disk offering)."); } // convert from bytes to GiB