CP-49966: Merge master into feature/vm-anti-affinity

xapi-project / xen-api

The Xapi Project's XenAPI Server

http://xenproject.org/developers/teams/xapi.html

Other

344 stars 283 forks source link

CP-49966: Merge master into feature/vm-anti-affinity #5708

Closed BengangY closed 1 month ago

BengangY commented 1 month ago

Resolve conflicts: ocaml/idl/schematest.ml ocaml/xapi-cli-server/cli_frontend.ml ocaml/xapi-consts/api_errors.ml ocaml/xapi-types/features.ml ocaml/xapi-types/features.mli

Will change it to ready after all XenRT testing cases passed.