You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/03/05 19:37:39 UTC
[37/50] [abbrv] git commit: refs/heads/ui-multiple-nics - Merge
branch 'vim51_win8'
Merge branch 'vim51_win8'
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/88355b94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/88355b94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/88355b94
Branch: refs/heads/ui-multiple-nics
Commit: 88355b945740554447585e65539bb59d5f028fa0
Parents: 69678c8 613a061
Author: Min Chen <mi...@citrix.com>
Authored: Mon Mar 4 18:03:49 2013 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Mon Mar 4 18:03:49 2013 -0800
----------------------------------------------------------------------
agent/src/com/cloud/agent/AgentShell.java | 4 +-
client/tomcatconf/componentContext.xml.in | 13 +-
client/tomcatconf/nonossComponentContext.xml.in | 14 +-
deps/install-non-oss.sh | 11 +-
plugins/hypervisors/vmware/pom.xml | 12 -
.../hypervisor/vmware/VmwareServerDiscoverer.java | 125 +-
.../vmware/manager/VmwareManagerImpl.java | 57 +-
.../vmware/manager/VmwareStorageManagerImpl.java | 358 ++--
.../vmware/resource/VmwareContextFactory.java | 12 +-
.../hypervisor/vmware/resource/VmwareResource.java | 258 ++--
.../VmwareSecondaryStorageContextFactory.java | 31 +-
.../VmwareSecondaryStorageResourceHandler.java | 18 +-
pom.xml | 5 +-
.../cloud/baremetal/BareMetalTemplateAdapter.java | 33 +-
.../cloud/template/HyervisorTemplateAdapter.java | 340 ----
.../cloud/template/HypervisorTemplateAdapter.java | 339 ++++
.../UserVmCloneSettingDaoTestConfiguration.java | 2 +-
setup/db/db/schema-40to410.sql | 53 +-
setup/db/db/schema-410to420.sql | 7 +
vmware-base/pom.xml | 12 -
.../src/com/cloud/hypervisor/vmware/mo/BaseMO.java | 74 +-
.../com/cloud/hypervisor/vmware/mo/ClusterMO.java | 318 ++--
.../vmware/mo/CustomFieldsManagerMO.java | 32 +-
.../cloud/hypervisor/vmware/mo/DatacenterMO.java | 328 ++--
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 186 ++-
.../vmware/mo/DistributedVirtualSwitchMO.java | 12 +-
.../vmware/mo/HostDatastoreBrowserMO.java | 58 +-
.../vmware/mo/HostDatastoreSystemMO.java | 92 +-
.../hypervisor/vmware/mo/HostFirewallSystemMO.java | 14 +-
.../src/com/cloud/hypervisor/vmware/mo/HostMO.java | 486 +++---
.../cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java | 109 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 285 ++--
.../com/cloud/hypervisor/vmware/mo/NetworkMO.java | 15 +-
.../cloud/hypervisor/vmware/mo/PerfManagerMO.java | 85 +-
.../src/com/cloud/hypervisor/vmware/mo/TaskMO.java | 24 +-
.../hypervisor/vmware/mo/VirtualDiskManagerMO.java | 126 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 1276 ++++++++-------
.../cloud/hypervisor/vmware/util/VmwareClient.java | 558 +++++++
.../hypervisor/vmware/util/VmwareContext.java | 370 +++--
.../vmware/util/VmwareGuestOsMapper.java | 282 ++--
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 269 ++--
.../vmware/mo/TestVmwareContextFactory.java | 14 +-
.../cloud/hypervisor/vmware/mo/TestVmwareMO.java | 1 -
vmware-base/test/com/cloud/vmware/TestVMWare.java | 7 +-
44 files changed, 3716 insertions(+), 3009 deletions(-)
----------------------------------------------------------------------