Closed songxiaoyan closed 3 years ago
@songxiaoyan Can you take a look at the merge conflict issue? This was likely caused by the other PR #527 just merged to master
@songxiaoyan Can you take a look at the merge conflict issue? This was likely caused by the other PR #527 just merged to master
The conflict has been resolved and can be merged to the master
Merging #520 (b0c1b9d) into master (c7b0bae) will decrease coverage by
2.26%
. The diff coverage is2.57%
.
@@ Coverage Diff @@
## master #520 +/- ##
============================================
- Coverage 35.10% 32.84% -2.27%
+ Complexity 1154 1111 -43
============================================
Files 471 473 +2
Lines 11442 11766 +324
Branches 1465 1515 +50
============================================
- Hits 4017 3864 -153
- Misses 6883 7367 +484
+ Partials 542 535 -7
Impacted Files | Coverage Δ | Complexity Δ | |
---|---|---|---|
...alcor/elasticipmanager/dao/ElasticIpRangeRepo.java | 75.00% <0.00%> (-25.00%) |
2.00 <0.00> (ø) |
|
...ewei/alcor/elasticipmanager/dao/ElasticIpRepo.java | 75.00% <0.00%> (-25.00%) |
2.00 <0.00> (ø) |
|
...or/macmanager/dao/MacRangePartitionRepository.java | 23.07% <0.00%> (-6.93%) |
1.00 <0.00> (ø) |
|
...rewei/alcor/macmanager/dao/MacRangeRepository.java | 14.63% <0.00%> (-1.16%) |
3.00 <0.00> (ø) |
|
...rewei/alcor/macmanager/dao/MacStateRepository.java | 26.08% <0.00%> (-3.92%) |
3.00 <0.00> (ø) |
|
...uturewei/alcor/nodemanager/dao/NodeRepository.java | 13.33% <0.00%> (-0.96%) |
3.00 <0.00> (ø) |
|
...r/portmanager/exception/UpdatePortIpException.java | 0.00% <0.00%> (ø) |
0.00 <0.00> (?) |
|
...rewei/alcor/portmanager/processor/PortContext.java | 46.47% <0.00%> (-21.17%) |
19.00 <0.00> (-9.00) |
|
.../alcor/portmanager/request/FetchSubnetRequest.java | 52.00% <0.00%> (-4.53%) |
4.00 <1.00> (ø) |
|
...ortmanager/request/UpdatePortIpAddressRequest.java | 0.00% <0.00%> (ø) |
0.00 <0.00> (?) |
|
... and 49 more |
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact)
,ø = not affected
,? = missing data
Powered by Codecov. Last update c7b0bae...b0c1b9d. Read the comment docs.