You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2014/01/15 11:17:08 UTC
[2/2] git commit: updated refs/heads/4.3 to 264f517
Merge branch '4.3' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.3
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/264f5172
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/264f5172
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/264f5172
Branch: refs/heads/4.3
Commit: 264f5172be594114eed59e80be0e5aaf40b865bf
Parents: 00a5063 fef4c79
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Wed Jan 15 11:16:31 2014 +0100
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Wed Jan 15 11:16:31 2014 +0100
----------------------------------------------------------------------
api/src/com/cloud/network/PhysicalNetwork.java | 3 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 16 ++-
.../cloud/vm/VirtualMachinePowerStateSync.java | 10 +-
.../vm/VirtualMachinePowerStateSyncImpl.java | 36 ++---
.../com/cloud/upgrade/dao/Upgrade421to430.java | 43 ++++++
.../src/com/cloud/vm/dao/VMInstanceDao.java | 6 +-
.../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 140 +++++++++++--------
.../storage/volume/VolumeServiceImpl.java | 6 +-
.../framework/messagebus/MessageDispatcher.java | 97 +++++++++----
.../HypervResource/CloudStackTypes.cs | 33 +++--
.../HypervResource/HypervResourceController.cs | 11 +-
.../src/com/cloud/hypervisor/XenServerGuru.java | 6 +-
.../hypervisor/xen/resource/XcpOssResource.java | 37 +++++
.../management/ContrailElementImpl.java | 27 ++++
.../contrail/management/ContrailGuru.java | 27 +++-
.../contrail/management/ContrailManager.java | 2 +-
.../management/ContrailManagerImpl.java | 38 +++--
.../contrail/management/ServerDBSync.java | 2 +-
.../contrail/management/ServerDBSyncImpl.java | 3 +-
.../contrail/model/NetworkPolicyModel.java | 2 +-
.../management/ManagementServerMock.java | 2 +-
.../management/NetworkProviderTest.java | 20 +--
.../com/cloud/storage/VolumeApiServiceImpl.java | 9 +-
.../systemvm64template/postinstall.sh | 3 +-
.../definitions/systemvmtemplate/postinstall.sh | 5 +-
ui/scripts/network.js | 6 +-
ui/scripts/ui-custom/zoneWizard.js | 5 +-
27 files changed, 421 insertions(+), 174 deletions(-)
----------------------------------------------------------------------