Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C1D01FC58 for ; Thu, 21 Mar 2013 05:22:04 +0000 (UTC) Received: (qmail 82040 invoked by uid 500); 21 Mar 2013 05:21:53 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 81809 invoked by uid 500); 21 Mar 2013 05:21:53 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 80477 invoked by uid 99); 21 Mar 2013 05:21:51 -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, 21 Mar 2013 05:21:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A5DA03EC4B; Thu, 21 Mar 2013 05:21:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: koushik@apache.org To: cloudstack-commits@incubator.apache.org Date: Thu, 21 Mar 2013 05:22:36 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [49/50] [abbrv] git commit: refs/heads/cisco-vnmc-api-integration - Fixed build issue from master merge Fixed build issue from master merge Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9e9c1792 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9e9c1792 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9e9c1792 Branch: refs/heads/cisco-vnmc-api-integration Commit: 9e9c179212e8c0896972c1f19a3327f97832697e Parents: f0c1af2 Author: Koushik Das Authored: Thu Mar 21 00:25:10 2013 +0530 Committer: Koushik Das Committed: Thu Mar 21 00:25:10 2013 +0530 ---------------------------------------------------------------------- .../hypervisor/vmware/resource/VmwareResource.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9e9c1792/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index d53fe64..98847c1 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -1570,7 +1570,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa vmMo.getRunningHost(), vlanId, null, null, this._ops_timeout, true); } else { networkInfo = HypervisorHostHelper.prepareNetwork(this._publicTrafficInfo.getVirtualSwitchName(), "cloud.public", - vmMo.getRunningHost(), vlanId, false, null, null, this._ops_timeout, vSwitchType, _portsPerDvPortGroup); + vmMo.getRunningHost(), vlanId, null, null, this._ops_timeout, vSwitchType, _portsPerDvPortGroup, false); } int nicIndex = allocPublicNicIndex(vmMo);