Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 11A1B10B12 for ; Sat, 12 Dec 2015 21:30:25 +0000 (UTC) Received: (qmail 39335 invoked by uid 500); 12 Dec 2015 21:30:19 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 39235 invoked by uid 500); 12 Dec 2015 21:30:19 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 39210 invoked by uid 99); 12 Dec 2015 21:30:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Dec 2015 21:30:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 994A9E02A2; Sat, 12 Dec 2015 21:30:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: remi@apache.org To: commits@cloudstack.apache.org Date: Sat, 12 Dec 2015 21:30:23 -0000 Message-Id: <830cae634c1147619e47dbfaf1b67d28@git.apache.org> In-Reply-To: <1b66247402c349a1bb5caaf8e495a27b@git.apache.org> References: <1b66247402c349a1bb5caaf8e495a27b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/7] git commit: updated refs/heads/master to cdfcea3 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 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 Authored: Sat Dec 12 14:38:27 2015 +0100 Committer: Daan Hoogland 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 ----------------------------------------------------------------------