Merge feature/configure-ssh to master #6361
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
Resolved onflicts: ocaml/idl/datamodel_errors.ml ocaml/xapi-consts/api_errors.ml Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
Resolved onflicts: ocaml/idl/datamodel_errors.ml ocaml/xapi-consts/api_errors.ml
Change call_slave_... functions for new added ssh feature code to resolve build failure. Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
1. Sync `master` to `feature/configure-ssh` 2. Resolve build failure in `message_forwarding.ml` in the commit `0b79d88`.
Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
changlei-li
approved these changes
Mar 17, 2025
gangj
approved these changes
Mar 17, 2025
There was a problem hiding this comment.
$ git show 18ba7e724fbd0d9454a2c62cf9684b7e10af5448
commit 18ba7e724fbd0d9454a2c62cf9684b7e10af5448 (bengang_github/private/bengangy/merge-ssh-to-master, private/bengangy/merge-ssh-to-master)
Author: Bengang Yuan <bengang.yuan@cloud.com>
Date: Mon Mar 17 01:25:33 2025 +0000
Update datamodel_lifecycle.ml
Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
diff --git a/ocaml/idl/datamodel_lifecycle.ml b/ocaml/idl/datamodel_lifecycle.ml
index 38ed231cd..d21cad211 100644
--- a/ocaml/idl/datamodel_lifecycle.ml
+++ b/ocaml/idl/datamodel_lifecycle.ml
@@ -205,6 +205,10 @@ let prototyped_of_message = function
Some "22.26.0"
| "VTPM", "create" ->
Some "22.26.0"
+ | "host", "disable_ssh" ->
+ Some "25.12.0-next"
+ | "host", "enable_ssh" ->
+ Some "25.12.0-next"
| "host", "emergency_clear_mandatory_guidance" ->
Some "24.10.0"
| "host", "apply_recommended_guidances" ->
@@ -223,6 +227,10 @@ let prototyped_of_message = function
Some "23.30.0"
| "VM", "set_groups" ->
Some "24.19.1"
+ | "pool", "disable_ssh" ->
+ Some "25.12.0-next"
+ | "pool", "enable_ssh" ->
+ Some "25.12.0-next"
| "pool", "get_guest_secureboot_readiness" ->
Some "24.17.0"
| "pool", "set_ext_auth_cache_expiry" ->
|
I think the commit message of 20d6e34 should be something like: "Merge feature/configure-ssh to master"? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
feature/configure-sshtomaster.datamodel_lifecycle.mlto25.12.0-next.