Re: [PR] 4.19 merge [cloudstack]

2025-01-31 Thread via GitHub
github-actions[bot] commented on PR #10303: URL: https://github.com/apache/cloudstack/pull/10303#issuecomment-2626993546 This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch. -- This is an automated message from the Apache

Re: [PR] 4.19 merge [cloudstack]

2025-01-31 Thread via GitHub
DaanHoogland commented on PR #10303: URL: https://github.com/apache/cloudstack/pull/10303#issuecomment-2627054249 thanks for the merge effort @shwstppr -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to

Re: [PR] 4.19 merge [cloudstack]

2025-01-31 Thread via GitHub
weizhouapache closed pull request #10303: 4.19 merge URL: https://github.com/apache/cloudstack/pull/10303 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail

Re: [PR] 4.19 merge [cloudstack]

2025-01-31 Thread via GitHub
github-actions[bot] commented on PR #10303: URL: https://github.com/apache/cloudstack/pull/10303#issuecomment-2627007959 This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch. -- This is an automated message from the Apache

Re: [PR] 4.19 merge [cloudstack]

2025-01-31 Thread via GitHub
codecov[bot] commented on PR #10303: URL: https://github.com/apache/cloudstack/pull/10303#issuecomment-2626993774 ## [Codecov](https://app.codecov.io/gh/apache/cloudstack/pull/10303?dropdown=coverage&src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comme

Re: [PR] 4.19 merge [cloudstack]

2025-01-31 Thread via GitHub
shwstppr commented on PR #10303: URL: https://github.com/apache/cloudstack/pull/10303#issuecomment-2626813543 Working on forward merge -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific

Re: [PR] 4.19 merge [cloudstack]

2025-01-31 Thread via GitHub
DaanHoogland commented on PR #10303: URL: https://github.com/apache/cloudstack/pull/10303#issuecomment-2626673872 > Should we "squash and merge" this pr ? no, we should review and redo this imnsho cc @shwstppr @vishesh92 -- This is an automated message from the Apache Git Service.

Re: [PR] 4.19 merge [cloudstack]

2025-01-31 Thread via GitHub
weizhouapache commented on code in PR #10303: URL: https://github.com/apache/cloudstack/pull/10303#discussion_r1936869035 ## ui/src/config/section/network.js: ## @@ -140,7 +140,14 @@ export default { icon: 'edit-outlined', label: 'label.update.network',

Re: [PR] 4.19 merge [cloudstack]

2025-01-31 Thread via GitHub
shwstppr commented on code in PR #10303: URL: https://github.com/apache/cloudstack/pull/10303#discussion_r1936831030 ## ui/src/config/section/network.js: ## @@ -140,7 +140,14 @@ export default { icon: 'edit-outlined', label: 'label.update.network',

Re: [PR] 4.19 merge [cloudstack]

2025-01-30 Thread via GitHub
Pearl1594 commented on code in PR #10303: URL: https://github.com/apache/cloudstack/pull/10303#discussion_r1936058183 ## engine/schema/src/main/java/com/cloud/user/UserAccountVO.java: ## @@ -131,12 +132,6 @@ public enum Setup2FAstatus { public UserAccountVO() { } -

[PR] 4.19 merge [cloudstack]

2025-01-30 Thread via GitHub
DaanHoogland opened a new pull request, #10303: URL: https://github.com/apache/cloudstack/pull/10303 ### Description This PR intends to deal with a set of merge conflicts ### Types of changes - [ ] Breaking change (fix o