This is an automated email from the ASF dual-hosted git repository. dahn pushed a change to branch 4.20 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from dd84c74e822 Merge branch '4.19' into 4.20 add 0648d000b24 Support XenServer 8.4 / XCP 8.3 - make scripts python3 compatible (#10684) No new revisions were added by this update. Summary of changes: .../resources/META-INF/db/schema-42000to42010.sql | 53 ++ plugins/hypervisors/ovm/pom.xml | 2 +- plugins/hypervisors/xenserver/pom.xml | 2 +- .../xenserver/discoverer/XcpServerDiscoverer.java | 7 +- .../xenserver/resource/CitrixResourceBase.java | 4 + ...er600Resource.java => XcpServer83Resource.java} | 4 +- .../resource/XenServerConnectionPool.java | 10 +- ...er600Resource.java => Xenserver84Resource.java} | 5 +- .../wrapper/xenbase/CitrixStartCommandWrapper.java | 25 +- .../java/com/xensource/xenapi/ConnectionNew.java | 335 ++++++++++++ pom.xml | 2 +- .../xenserver/{xcposs => xcpserver83}/NFSSR.py | 40 +- .../xenserver/{xcpserver => xcpserver83}/patch | 9 +- .../{ => xenserver84}/cloud-plugin-storage | 17 +- .../{ => xenserver84}/cloudstack_pluginlib.py | 77 +-- .../xenserver/{ => xenserver84}/ovs-vif-flows.py | 34 +- .../xenserver/{xenserver65 => xenserver84}/patch | 16 +- .../hypervisor/xenserver/{ => xenserver84}/swift | 52 +- .../hypervisor/xenserver/{ => xenserver84}/vmops | 598 ++++++++++----------- .../xenserver/{ => xenserver84}/vmopsSnapshot | 89 ++- .../xenserver/{ => xenserver84}/vmopspremium | 18 +- .../storage/template/UploadManagerImpl.java | 14 +- .../smoke/test_deploy_vm_extra_config_data.py | 4 +- test/integration/smoke/test_guest_os.py | 5 +- 24 files changed, 937 insertions(+), 485 deletions(-) copy plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/{XenServer600Resource.java => XcpServer83Resource.java} (87%) copy plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/{XenServer600Resource.java => Xenserver84Resource.java} (87%) create mode 100644 plugins/hypervisors/xenserver/src/main/java/com/xensource/xenapi/ConnectionNew.java copy scripts/vm/hypervisor/xenserver/{xcposs => xcpserver83}/NFSSR.py (90%) mode change 100644 => 100755 copy scripts/vm/hypervisor/xenserver/{xcpserver => xcpserver83}/patch (90%) copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/cloud-plugin-storage (97%) copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/cloudstack_pluginlib.py (95%) copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/ovs-vif-flows.py (84%) copy scripts/vm/hypervisor/xenserver/{xenserver65 => xenserver84}/patch (89%) copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/swift (98%) mode change 100755 => 100644 copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/vmops (76%) copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/vmopsSnapshot (94%) mode change 100755 => 100644 copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/vmopspremium (95%)