4.19 merge #10303
Open
4.19 merge #10303
+579
−72
Conversation
This file contains 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
* server: fix attach uploaded volume Fixes #10120 When an uploaded volume is attached to a VM for which no existing volume can be found it was resulting in error. For such volumes, server needs to find a suitable pool first and copy them to the pool from secondary store. Signed-off-by: Abhishek Kumar <[email protected]> * fix Signed-off-by: Abhishek Kumar <[email protected]> * fix Signed-off-by: Abhishek Kumar <[email protected]> * add unit tests Signed-off-by: Abhishek Kumar <[email protected]> --------- Signed-off-by: Abhishek Kumar <[email protected]> Co-authored-by: Boris Stoyanov - a.k.a Bobby <[email protected]>
Signed-off-by: Abhishek Kumar <[email protected]>
…t_ref for the removed pools (#9852)
Signed-off-by: Abhishek Kumar <[email protected]>
DaanHoogland
requested review from
vishesh92,
weizhouapache and
bernardodemarco
Pearl1594
approved these changes
Jan 30, 2025
| return String.format("UserAccount %s.", ReflectionToStringBuilderUtils.reflectOnlySelectedFields | ||
| (this, "id", "uuid", "username", "accountName")); | ||
| } | ||
|
|
There was a problem hiding this comment.
Not sure if we have to retain this: https://github.com/apache/cloudstack/pull/9873/files#diff-ad04db4978745b82495c1971e127ef6d1a89fd05ff28530b775bd5ae0c0a848fR134-R138
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.
Description
This PR intends to deal with a set of merge conflicts
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
How did you try to break this feature and the system with this change?