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 9B0AF114B4 for ; Mon, 18 Aug 2014 22:03:55 +0000 (UTC) Received: (qmail 3738 invoked by uid 500); 18 Aug 2014 22:03:55 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 3703 invoked by uid 500); 18 Aug 2014 22:03:55 -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 3690 invoked by uid 99); 18 Aug 2014 22:03:55 -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, 18 Aug 2014 22:03:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 229149C6769; Mon, 18 Aug 2014 22:03:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: commits@cloudstack.apache.org Date: Mon, 18 Aug 2014 22:03:55 -0000 Message-Id: <28f1de2c63fb481086f331de2d2ac3b5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: updated refs/heads/master to 097b2d7 Repository: cloudstack Updated Branches: refs/heads/master c319c0b3e -> 097b2d711 kvm: Return capitalized NONE when no disk cache mode is set This caused Instances not to start under rare circumstances Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eeac8183 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eeac8183 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eeac8183 Branch: refs/heads/master Commit: eeac81838fcc3c53d2115074c8141c9411d3ef4c Parents: c319c0b Author: Wido den Hollander Authored: Mon Aug 18 23:58:50 2014 +0200 Committer: Wido den Hollander Committed: Mon Aug 18 23:58:50 2014 +0200 ---------------------------------------------------------------------- .../kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eeac8183/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java index 6b29e9c..3480a97 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java @@ -441,7 +441,7 @@ public class LibvirtVMDef { @Override public String toString() { if (_diskCacheMode == null) { - return "none"; + return "NONE"; } return _diskCacheMode; }