[IGNORE THIS - DO NOT MERGE] ht main compare #95
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
Signed-off-by: Khosrow Moossavi <[email protected]>
Signed-off-by: Khosrow Moossavi <[email protected]>
Merge forward from cca_4.10 to cca.4.12 See merge request dev/cloudstack!130
Add missing fields to disk_offering_view See merge request dev/cloudstack!132
Signed-off-by: Abhishek Kumar <[email protected]>
Signed-off-by: Abhishek Kumar <[email protected]>
Signed-off-by: Abhishek Kumar <[email protected]>
Signed-off-by: Abhishek Kumar <[email protected]>
Signed-off-by: Abhishek Kumar <[email protected]>
Signed-off-by: Abhishek Kumar <[email protected]>
Signed-off-by: Abhishek Kumar <[email protected]>
Signed-off-by: Abhishek Kumar <[email protected]>
shwstppr
commented
Jul 25, 2022
| @Parameter(name = ApiConstants.URL, | ||
| type = CommandType.STRING, | ||
| required = true, | ||
| required = false, |
Signed-off-by: Abhishek Kumar <[email protected]>
|
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch. |
shwstppr
commented
Jul 26, 2022
| .next("4.12.0.10", new Upgrade41210to412011()) | ||
| .next("4.12.0.11", new Upgrade41211to412012()) | ||
| .next("4.12.0.12", new Upgrade41212to412013()) | ||
| .next("4.12.0.25", new Upgrade412025to41300()) |
There was a problem hiding this comment.
Thi may need to be updated depending on current custom version
|
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch. |
|
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch. |
|
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch. |
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
Code diff comapre PR
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?