This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch split-connections
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 01bf0c5 Adding VPN options for IKE version and IKE split connections.
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)
add 9cf1e0e vmware: Fix VMware OVF properties copy from template (#4738)
add 4c16024 ui: fix login when username is email (#4910)
add 87d73b9 ui: Korean language support for all features of the new
CloudStack UI. (#4916)
add 6200ac8 ui: Search view - Fixes the color style of the filter icon
(#4917)
add f00b5fc server: Fix for the issue of recover VM not able to attach
the data disks which are there before destroy in case of VMware (#4493)
add 50da578 test: reduce vr traceroute hops (#4913)
add 8fec222 ui: fix not find tab name due to language other than English
(#4920)
add 0302750 vmware: Add support for VMware 7 (#4300)
add 90fc5ac ui: Show diskoffering for create volume from ROOT volume
snaps (#4912)
add 0bbf114 ui: Support to update disk/network offering tags from UI
(#4923)
add dad1269 Merge branch '4.15' into split-connections
No new revisions were added by this update.
Summary of changes:
.../java/com/cloud/vm/snapshot/VMSnapshot.java | 1 +
.../command/admin/usage/ListUsageRecordsCmd.java | 9 +
...ontrolAnswer.java => GetVmVncTicketAnswer.java} | 17 +-
...uterCommand.java => GetVmVncTicketCommand.java} | 19 +-
.../cloud/agent/api/MigrateVmToPoolCommand.java | 18 +-
.../agent/api/storage/MigrateVolumeCommand.java | 8 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 92 +-
.../engine/orchestration/VolumeOrchestrator.java | 7 +
.../resources/META-INF/db/schema-41500to41510.sql | 74 +-
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 15 +-
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 84 +-
.../hypervisor/vmware/resource/VmwareResource.java | 137 +-
.../motion/VmwareStorageMotionStrategy.java | 118 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 38 +-
pom.xml | 2 +-
.../com/cloud/servlet/ConsoleProxyClientParam.java | 9 +
.../com/cloud/servlet/ConsoleProxyServlet.java | 62 +
.../com/cloud/storage/VolumeApiServiceImpl.java | 8 +-
.../java/com/cloud/usage/UsageServiceImpl.java | 105 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 14 +-
services/console-proxy/server/pom.xml | 5 +
.../java/com/cloud/consoleproxy/ConsoleProxy.java | 6 +
.../consoleproxy/ConsoleProxyClientParam.java | 9 +
.../ConsoleProxyHttpHandlerHelper.java | 4 +
.../consoleproxy/ConsoleProxyNoVNCHandler.java | 2 +
.../consoleproxy/ConsoleProxyNoVncClient.java | 105 +-
.../com/cloud/consoleproxy/vnc/NoVncClient.java | 37 +-
.../websocket/WebSocketReverseProxy.java | 118 +
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_diagnostics.py | 12 +-
test/integration/smoke/test_vm_life_cycle.py | 45 +-
tools/marvin/marvin/lib/common.py | 8 +-
ui/public/locales/ko_KR.json | 4020 ++++++++++++--------
ui/src/api/index.js | 2 +-
ui/src/components/view/SearchView.vue | 16 +-
ui/src/config/section/offering.js | 4 +-
ui/src/config/section/storage.js | 8 +-
ui/src/views/AutogenView.vue | 4 +-
.../views/network/IngressEgressRuleConfigure.vue | 2 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 114 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 41 +-
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 39 +-
44 files changed, 3575 insertions(+), 1879 deletions(-)
copy core/src/main/java/com/cloud/agent/api/{AgentControlAnswer.java =>
GetVmVncTicketAnswer.java} (73%)
copy core/src/main/java/com/cloud/agent/api/{CheckRouterCommand.java =>
GetVmVncTicketCommand.java} (77%)
create mode 100644
services/console-proxy/server/src/main/java/com/cloud/consoleproxy/websocket/WebSocketReverseProxy.java
