You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2023/01/04 09:22:59 UTC
[GitHub] [cloudstack] DaanHoogland opened a new pull request, #7047: fix merge diff display
DaanHoogland opened a new pull request, #7047:
URL: https://github.com/apache/cloudstack/pull/7047
### Description
This PR fixes the cli tool `git fwd-merge`
<!--- Describe your changes in DETAIL - And how has behaviour functionally changed. -->
<!-- For new features, provide link to FS, dev ML discussion etc. -->
<!-- In case of bug fix, the expected and actual behaviours, steps to reproduce. -->
<!-- When "Fixes: #<id>" is specified, the issue/PR will automatically be closed when this PR gets merged -->
<!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" -->
<!-- Fixes: # -->
<!--- ********************************************************************************* -->
<!--- NOTE: AUTOMATATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE DOCUMENTATION. -->
<!--- PLEASE PUT AN 'X' in only **ONE** box -->
<!--- ********************************************************************************* -->
### Types of changes
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
### Feature/Enhancement Scale or Bug Severity
#### Feature/Enhancement Scale
- [ ] Major
- [ ] Minor
#### Bug Severity
- [ ] BLOCKER
- [ ] Critical
- [ ] Major
- [ ] Minor
- [ ] Trivial
### Screenshots (if appropriate):
### How Has This Been Tested?
<!-- Please describe in detail how you tested your changes. -->
<!-- Include details of your testing environment, and the tests you ran to -->
<!-- see how your change affects other areas of the code, etc. -->
<!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md) document -->
--
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: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland closed pull request #7047: fix merge diff display
Posted by GitBox <gi...@apache.org>.
DaanHoogland closed pull request #7047: fix merge diff display
URL: https://github.com/apache/cloudstack/pull/7047
--
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: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] sonarcloud[bot] commented on pull request #7047: fix merge diff display
Posted by GitBox <gi...@apache.org>.
sonarcloud[bot] commented on PR #7047:
URL: https://github.com/apache/cloudstack/pull/7047#issuecomment-1372031696
Kudos, SonarCloud Quality Gate passed! [](https://sonarcloud.io/dashboard?id=apache_cloudstack&pullRequest=7047)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=7047&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=7047&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=7047&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=7047&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=7047&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=7047&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=7047&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=7047&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=7047&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=7047&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=7047&resolved=false&types=CODE_SMELL) [0 Code Smells](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=7047&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=7047&metric=coverage&view=list) No Coverage information
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=7047&metric=duplicated_lines_density&view=list) No Duplication information
--
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: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland merged pull request #7047: fix merge diff display
Posted by GitBox <gi...@apache.org>.
DaanHoogland merged PR #7047:
URL: https://github.com/apache/cloudstack/pull/7047
--
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: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] codecov[bot] commented on pull request #7047: fix merge diff display
Posted by GitBox <gi...@apache.org>.
codecov[bot] commented on PR #7047:
URL: https://github.com/apache/cloudstack/pull/7047#issuecomment-1372155263
# [Codecov](https://codecov.io/gh/apache/cloudstack/pull/7047?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#7047](https://codecov.io/gh/apache/cloudstack/pull/7047?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (f7fd631) into [main](https://codecov.io/gh/apache/cloudstack/commit/af59e76df6c9ad2b265cafb1b15195a89eafce9b?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (af59e76) will **increase** coverage by `0.04%`.
> The diff coverage is `27.41%`.
```diff
@@ Coverage Diff @@
## main #7047 +/- ##
============================================
+ Coverage 11.54% 11.58% +0.04%
- Complexity 7509 7548 +39
============================================
Files 2494 2494
Lines 246678 247073 +395
Branches 38533 38614 +81
============================================
+ Hits 28476 28629 +153
- Misses 214521 214699 +178
- Partials 3681 3745 +64
```
| [Impacted Files](https://codecov.io/gh/apache/cloudstack/pull/7047?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [...estration/service/NetworkOrchestrationService.java](https://codecov.io/gh/apache/cloudstack/pull/7047?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZW5naW5lL2FwaS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvY2xvdWRzdGFjay9lbmdpbmUvb3JjaGVzdHJhdGlvbi9zZXJ2aWNlL05ldHdvcmtPcmNoZXN0cmF0aW9uU2VydmljZS5qYXZh) | `100.00% <ø> (ø)` | |
| [...n/java/com/cloud/vm/VirtualMachineManagerImpl.java](https://codecov.io/gh/apache/cloudstack/pull/7047?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZW5naW5lL29yY2hlc3RyYXRpb24vc3JjL21haW4vamF2YS9jb20vY2xvdWQvdm0vVmlydHVhbE1hY2hpbmVNYW5hZ2VySW1wbC5qYXZh) | `5.89% <ø> (ø)` | |
| [...n/java/com/cloud/network/dao/IPAddressDaoImpl.java](https://codecov.io/gh/apache/cloudstack/pull/7047?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL2NvbS9jbG91ZC9uZXR3b3JrL2Rhby9JUEFkZHJlc3NEYW9JbXBsLmphdmE=) | `30.83% <0.00%> (-0.50%)` | :arrow_down: |
| [...ngine/schema/src/main/java/com/cloud/vm/NicVO.java](https://codecov.io/gh/apache/cloudstack/pull/7047?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL2NvbS9jbG91ZC92bS9OaWNWTy5qYXZh) | `50.47% <0.00%> (-1.49%)` | :arrow_down: |
| [...ema/src/main/java/com/cloud/vm/dao/NicDaoImpl.java](https://codecov.io/gh/apache/cloudstack/pull/7047?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL2NvbS9jbG91ZC92bS9kYW8vTmljRGFvSW1wbC5qYXZh) | `23.38% <0.00%> (-0.97%)` | :arrow_down: |
| [...bernetes/cluster/KubernetesClusterManagerImpl.java](https://codecov.io/gh/apache/cloudstack/pull/7047?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGx1Z2lucy9pbnRlZ3JhdGlvbnMva3ViZXJuZXRlcy1zZXJ2aWNlL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL2t1YmVybmV0ZXMvY2x1c3Rlci9LdWJlcm5ldGVzQ2x1c3Rlck1hbmFnZXJJbXBsLmphdmE=) | `0.00% <ø> (ø)` | |
| [...src/main/java/com/cloud/api/ApiResponseHelper.java](https://codecov.io/gh/apache/cloudstack/pull/7047?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL2FwaS9BcGlSZXNwb25zZUhlbHBlci5qYXZh) | `3.87% <0.00%> (-0.01%)` | :arrow_down: |
| [...com/cloud/api/query/dao/DataCenterJoinDaoImpl.java](https://codecov.io/gh/apache/cloudstack/pull/7047?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL2FwaS9xdWVyeS9kYW8vRGF0YUNlbnRlckpvaW5EYW9JbXBsLmphdmE=) | `1.85% <0.00%> (-0.11%)` | :arrow_down: |
| [...m/cloud/api/query/dao/DomainRouterJoinDaoImpl.java](https://codecov.io/gh/apache/cloudstack/pull/7047?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL2FwaS9xdWVyeS9kYW8vRG9tYWluUm91dGVySm9pbkRhb0ltcGwuamF2YQ==) | `0.47% <0.00%> (-0.04%)` | :arrow_down: |
| [...ava/com/cloud/api/query/vo/DomainRouterJoinVO.java](https://codecov.io/gh/apache/cloudstack/pull/7047?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL2FwaS9xdWVyeS92by9Eb21haW5Sb3V0ZXJKb2luVk8uamF2YQ==) | `0.00% <0.00%> (ø)` | |
| ... and [27 more](https://codecov.io/gh/apache/cloudstack/pull/7047?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | |
:mega: We’re building smart automated test selection to slash your CI/CD build times. [Learn more](https://about.codecov.io/iterative-testing/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
--
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: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org