You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/02/06 11:23:56 UTC
git commit: updated refs/heads/4.5 to af278fe
Repository: cloudstack
Updated Branches:
refs/heads/4.5 81994cf44 -> af278fe1a
Fix typos
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/af278fe1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/af278fe1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/af278fe1
Branch: refs/heads/4.5
Commit: af278fe1ab18a1404b2233f3dbb2c8b1e0edc0be
Parents: 81994cf
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Feb 6 15:46:52 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Feb 6 15:53:41 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/af278fe1/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 100755
--- 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/af278fe1/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 8cb8846..fe2171e 100755
--- 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();