cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [5/7] git commit: updated refs/heads/master to cdfcea3
Date Sat, 12 Dec 2015 21:30:23 GMT
Merge pull request #1132 from shapeblue/4.6-vmware-diskcontrollers

[4.6] CLOUDSTACK-4787 - vmware diskcontrollersSame as #1131 (see this for screenshots etc)

* pr/1132:
  CLOUDSTACK-4787: Allow users to select disk controller for VM/template
  CLOUDSTACK-4787 Allow selection of scsi controller type in vSphere

Signed-off-by: Daan Hoogland <daan@onecht.net>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8c78f89c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8c78f89c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8c78f89c

Branch: refs/heads/master
Commit: 8c78f89c91cf139b81110f80fbfede89a6f3df8b
Parents: 65bf2ed a15187a
Author: Daan Hoogland <daan@onecht.net>
Authored: Sat Dec 12 14:38:27 2015 +0100
Committer: Daan Hoogland <daan@onecht.net>
Committed: Sat Dec 12 14:38:28 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 +
 .../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    |  24 +
 21 files changed, 1148 insertions(+), 66 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c78f89c/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c78f89c/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------


Mime
View raw message