This is an automated email from the ASF dual-hosted git repository.
shwstppr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 22f6c19 Merge remote-tracking branch 'origin/4.15'
add 03c05bc tests: skip livemigration for centos (#4801)
add 99a9063 server: Added recursive fetch of child domains for
listUsageRecords API call (#4717)
add fdefee7 vmware: fix inter-cluster stopped vm and volume migration
(#4895)
add e47dc9c ldap: Fix orphan entry on ldap trust map after account
removal (#4899)
add 4bab06a systemvm: Restricting http access on VR to internal network
(#4847)
add 6b1c94e server: fix root disk size on vm reset (#4638)
add e824fdb Merge remote-tracking branch 'origin/4.14' into 4.15
add a64ad9d server: Prevent vm snapshots being indefinitely stuck in
Expunging state on deletion failure (#4898)
new cce7367 Merge remote-tracking branch 'apache/4.15'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/com/cloud/vm/snapshot/VMSnapshot.java | 1 +
.../command/admin/usage/ListUsageRecordsCmd.java | 9 ++
.../agent/api/storage/MigrateVolumeCommand.java | 16 ++--
.../com/cloud/vm/VirtualMachineManagerImpl.java | 34 +++----
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 15 +--
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 73 ++++++++------
.../hypervisor/vmware/resource/VmwareResource.java | 22 ++---
.../motion/VmwareStorageMotionStrategy.java | 106 ++++++++++-----------
.../apache/cloudstack/ldap/LdapManagerImpl.java | 38 +++++++-
.../com/cloud/storage/VolumeApiServiceImpl.java | 8 +-
.../java/com/cloud/usage/UsageServiceImpl.java | 105 ++++++++++++++++----
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 6 ++
systemvm/debian/etc/iptables/iptables-dhcpsrvr | 1 -
systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 5 +-
systemvm/debian/opt/cloud/bin/cs/CsApp.py | 10 --
test/integration/smoke/test_vm_life_cycle.py | 5 +
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 17 ++++
.../hypervisor/vmware/mo/VirtualMachineMO.java | 29 +++---
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 25 +++--
19 files changed, 333 insertions(+), 192 deletions(-)
