cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/master to 083a495
Date Fri, 06 Feb 2015 10:24:11 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 8414223a9 -> 083a4950a


Fix typos

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit af278fe1ab18a1404b2233f3dbb2c8b1e0edc0be)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


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 <rohit.yadav@shapeblue.com>
Authored: Fri Feb 6 15:46:52 2015 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
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<Long> 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<Long> networks = new ArrayList<Long>();

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();


Mime
View raw message