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 4062917B00 for ; Fri, 6 Feb 2015 10:24:12 +0000 (UTC) Received: (qmail 92211 invoked by uid 500); 6 Feb 2015 10:24:12 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 92181 invoked by uid 500); 6 Feb 2015 10:24:12 -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 92171 invoked by uid 99); 6 Feb 2015 10:24:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Feb 2015 10:24:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E2BD9E01CE; Fri, 6 Feb 2015 10:24:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Message-Id: <8cd9ccff5278476eac5036ab10452595@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 083a495 Date: Fri, 6 Feb 2015 10:24:11 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 8414223a9 -> 083a4950a Fix typos Signed-off-by: Rohit Yadav (cherry picked from commit af278fe1ab18a1404b2233f3dbb2c8b1e0edc0be) Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/083a4950 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/083a4950 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/083a4950 Branch: refs/heads/master Commit: 083a4950a9830b0af4f2f6d5e86ffe06d1f7216e Parents: 8414223 Author: Rohit Yadav Authored: Fri Feb 6 15:46:52 2015 +0530 Committer: Rohit Yadav Committed: Fri Feb 6 15:54:01 2015 +0530 ---------------------------------------------------------------------- api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java | 2 +- .../cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/083a4950/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java index e1916cb..3d13d6b 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java @@ -301,7 +301,7 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd { public List getNetworkIds() { if (ipToNetworkList != null && !ipToNetworkList.isEmpty()) { - if ((networkIds != null && !newtworkIds.isEmpty()) || ipAddress != null || getIp6Address() != null) { + if ((networkIds != null && !networkIds.isEmpty()) || ipAddress != null || getIp6Address() != null) { throw new InvalidParameterValueException("ipToNetworkMap can't be specified along with networkIds or ipAddress"); } else { List networks = new ArrayList(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/083a4950/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java index ad47359..3f1e52e 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java @@ -412,7 +412,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L else if (prodBrand.equals("XenServer") && prodVersion.equals("6.1.0")) return new XenServer610Resource(); else if (prodBrand.equals("XenServer") && prodVersion.equals("6.5.0")) - return new Xenserver650Resource(); + return new XenServer650Resource(); else if (prodBrand.equals("XenServer") && prodVersion.equals("6.2.0")) { if (hotfix != null && hotfix.equals(XenserverConfigs.XSHotFix62ESP1004)) { return new Xenserver625Resource();