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 A4F23F2C1 for ; Mon, 25 Mar 2013 17:52:09 +0000 (UTC) Received: (qmail 32161 invoked by uid 500); 25 Mar 2013 17:52:03 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 32043 invoked by uid 500); 25 Mar 2013 17:52:03 -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 31104 invoked by uid 99); 25 Mar 2013 17:52:02 -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 Mar 2013 17:52:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D3B3C820050; Mon, 25 Mar 2013 17:52:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Mon, 25 Mar 2013 17:52:33 -0000 Message-Id: In-Reply-To: <5642616fa1734ce7b376ffebf7163ad3@git.apache.org> References: <5642616fa1734ce7b376ffebf7163ad3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [33/50] [abbrv] git commit: refs/heads/ui-multiple-pod-ranges - CLOUDSTACK-1772: revert bc94948e0604e0e5931759be3c3d3155e84686f6, doesn't specify vnc listening port, make live migration work CLOUDSTACK-1772: revert bc94948e0604e0e5931759be3c3d3155e84686f6, doesn't specify vnc listening port, make live migration work Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ff63854b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ff63854b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ff63854b Branch: refs/heads/ui-multiple-pod-ranges Commit: ff63854b4d827033758835dc38231574994ed518 Parents: 01ea723 Author: Edison Su Authored: Thu Mar 21 17:52:56 2013 -0700 Committer: Chip Childers Committed: Fri Mar 22 12:46:50 2013 +0000 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ff63854b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 8492362..604bd00 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -3101,7 +3101,7 @@ ServerResource { ConsoleDef console = new ConsoleDef("pty", null, null, (short) 0); devices.addDevice(console); - GraphicDef grap = new GraphicDef("vnc", (short) 0, true, vmTO.getVncAddr(), null, + GraphicDef grap = new GraphicDef("vnc", (short) 0, true, null, null, null); devices.addDevice(grap);