Skip to content

Merge release/2.5.0 branch into develop branch#1825

Merged
0xnm merged 3 commits into
developfrom
nogorodnikov/merge-release-2.5.0-into-develop
Jan 16, 2024
Merged

Merge release/2.5.0 branch into develop branch#1825
0xnm merged 3 commits into
developfrom
nogorodnikov/merge-release-2.5.0-into-develop

Conversation

@0xnm

@0xnm 0xnm commented Jan 15, 2024

Copy link
Copy Markdown
Member

What does this PR do?

This PR does the merge of release/2.5.0 into develop branch with conflicts resolved.

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Make sure you discussed the feature or bugfix with the maintaining team in an Issue
  • Make sure each commit and the PR mention the Issue number (cf the CONTRIBUTING doc)

@0xnm
0xnm requested review from a team as code owners January 15, 2024 12:47
@codecov-commenter

codecov-commenter commented Jan 15, 2024

Copy link
Copy Markdown

Codecov Report

Merging #1825 (f625f66) into develop (7d96d64) will decrease coverage by 0.05%.
The diff coverage is n/a.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1825      +/-   ##
===========================================
- Coverage    83.57%   83.52%   -0.05%     
===========================================
  Files          467      467              
  Lines        16462    16470       +8     
  Branches      2480     2482       +2     
===========================================
- Hits         13757    13756       -1     
- Misses        2033     2034       +1     
- Partials       672      680       +8     

see 24 files with indirect coverage changes

@0xnm
0xnm merged commit 1e97c29 into develop Jan 16, 2024
@0xnm
0xnm deleted the nogorodnikov/merge-release-2.5.0-into-develop branch January 16, 2024 13:55
@xgouchet xgouchet added this to the 2.6.0 milestone Feb 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants