You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/06/23 15:09:09 UTC
git commit: updated refs/heads/master to 4610c76
Repository: cloudstack
Updated Branches:
refs/heads/master 23b1f228a -> 4610c76fa
CLOUDSTACK-6967 merge problem resolution
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4610c76f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4610c76f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4610c76f
Branch: refs/heads/master
Commit: 4610c76fa9178ca056ad523cdf980a7ee3533ef2
Parents: 23b1f22
Author: Funs Kessen <fu...@barred.org>
Authored: Mon Jun 23 15:08:51 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jun 23 15:08:51 2014 +0200
----------------------------------------------------------------------
plugins/hypervisors/ovm3/pom.xml | 6 +++---
.../com/cloud/hypervisor/ovm3/hypervisor/Ovm3ResourceBase.java | 2 +-
.../network/contrail/management/ManagementServerMock.java | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4610c76f/plugins/hypervisors/ovm3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml
index 22c9fe0..f8a9158 100644
--- a/plugins/hypervisors/ovm3/pom.xml
+++ b/plugins/hypervisors/ovm3/pom.xml
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>xapi</artifactId>
+ <groupId>net.java.dev.vcc.thirdparty</groupId>
+ <artifactId>xen-api</artifactId>
<version>${cs.xapi.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4610c76f/plugins/hypervisors/ovm3/src/com/cloud/hypervisor/ovm3/hypervisor/Ovm3ResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/com/cloud/hypervisor/ovm3/hypervisor/Ovm3ResourceBase.java b/plugins/hypervisors/ovm3/src/com/cloud/hypervisor/ovm3/hypervisor/Ovm3ResourceBase.java
index 6b563d5..271e6c0 100755
--- a/plugins/hypervisors/ovm3/src/com/cloud/hypervisor/ovm3/hypervisor/Ovm3ResourceBase.java
+++ b/plugins/hypervisors/ovm3/src/com/cloud/hypervisor/ovm3/hypervisor/Ovm3ResourceBase.java
@@ -1868,7 +1868,7 @@ public class Ovm3ResourceBase implements ServerResource, HypervisorResource,
s_logger.debug("VM " + vm.getKey() + " state: " + vm.getValue()
+ ":" + convertStateToPower(vm.getValue()));
vmStates.put(vm.getKey(), new HostVmStateReportEntry(
- convertStateToPower(vm.getValue()), c.getIp(), null));
+ convertStateToPower(vm.getValue()), c.getIp()));
}
return vmStates;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4610c76f/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java
index 50419ea..30e270b 100644
--- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java
+++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java
@@ -327,7 +327,7 @@ public class ManagementServerMock {
_znet = _networkService.getPhysicalNetwork(id);
List<PhysicalNetworkVO> nets = _physicalNetworkDao.listByZoneAndTrafficType(_zone.getId(), TrafficType.Public);
if (nets == null || nets.isEmpty()) {
- _networkService.addTrafficTypeToPhysicalNetwork(_znet.getId(), TrafficType.Public.toString(), "vlan", null, null, null, null, null, null);
+ _networkService.addTrafficTypeToPhysicalNetwork(_znet.getId(), TrafficType.Public.toString(), "vlan", null, null, null, null, null, null, null);
}
} catch (InvalidParameterValueException e) {
List<String> isolationMethods = new ArrayList<String>();
@@ -337,7 +337,7 @@ public class ManagementServerMock {
"znet");
List<PhysicalNetworkVO> nets = _physicalNetworkDao.listByZoneAndTrafficType(_zone.getId(), TrafficType.Public);
if (nets == null || nets.isEmpty()) {
- _networkService.addTrafficTypeToPhysicalNetwork(_znet.getId(), TrafficType.Public.toString(), "vlan", null, null, null, null, null, null);
+ _networkService.addTrafficTypeToPhysicalNetwork(_znet.getId(), TrafficType.Public.toString(), "vlan", null, null, null, null, null, null, null);
}
}
if (_znet.getState() != PhysicalNetwork.State.Enabled) {
@@ -353,7 +353,7 @@ public class ManagementServerMock {
}
}
if (!found) {
- _networkService.addTrafficTypeToPhysicalNetwork(_znet.getId(), TrafficType.Guest.toString(), "vlan", null, null, null, null, null, null);
+ _networkService.addTrafficTypeToPhysicalNetwork(_znet.getId(), TrafficType.Guest.toString(), "vlan", null, null, null, null, null, null, null);
}
Pair<List<? extends PhysicalNetworkServiceProvider>, Integer> providers =