You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/12/12 22:30:25 UTC
[7/7] git commit: updated refs/heads/master to cdfcea3
Merge release branch 4.6 to master
* 4.6:
[UI] bug fix: Delete added ACL lists is not available for Domain Admin and normal users
CLOUDSTACK-4787: Allow users to select disk controller for VM/template
CLOUDSTACK-4787 Allow selection of scsi controller type in vSphere
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cdfcea3d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cdfcea3d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cdfcea3d
Branch: refs/heads/master
Commit: cdfcea3da27837e20a9511a6071f542158977c63
Parents: e703028 1597a4c
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Dec 12 22:28:38 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Dec 12 22:29:19 2015 +0100
----------------------------------------------------------------------
api/src/com/cloud/vm/VmDetailConstants.java | 1 +
.../storage/command/AttachCommand.java | 18 +-
.../com/cloud/hypervisor/guru/VMwareGuru.java | 7 +
.../vmware/manager/VmwareManager.java | 1 +
.../vmware/manager/VmwareManagerImpl.java | 8 +
.../vmware/resource/VmwareResource.java | 205 +++++++-
.../resource/VmwareStorageProcessor.java | 52 +-
server/src/com/cloud/configuration/Config.java | 2 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 6 +
server/src/com/cloud/vm/UserVmManagerImpl.java | 14 +
ui/scripts/templates.js | 20 +
ui/scripts/vpc.js | 21 +-
.../cloud/hypervisor/vmware/mo/ClusterMO.java | 35 +-
.../vmware/mo/DiskControllerType.java | 31 +-
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 17 +-
.../vmware/mo/HypervisorHostHelper.java | 112 +++-
.../vmware/mo/ScsiDiskControllerType.java | 24 +
.../hypervisor/vmware/mo/VirtualMachineMO.java | 514 +++++++++++++++++--
.../hypervisor/vmware/mo/VmdkAdapterType.java | 48 ++
.../vmware/mo/VmdkFileDescriptor.java | 70 +++
.../vmware/mo/VmwareHypervisorHost.java | 5 +-
.../hypervisor/vmware/util/VmwareHelper.java | 25 +
22 files changed, 1164 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdfcea3d/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdfcea3d/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdfcea3d/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdfcea3d/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdfcea3d/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdfcea3d/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdfcea3d/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdfcea3d/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdfcea3d/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
----------------------------------------------------------------------