Skip to content

chore: utils.Merge#6074

Merged
zirain merged 2 commits intoenvoyproxy:mainfrom
zirain:use-one-merge-func
May 15, 2025
Merged

chore: utils.Merge#6074
zirain merged 2 commits intoenvoyproxy:mainfrom
zirain:use-one-merge-func

Conversation

@zirain
Copy link
Member

@zirain zirain commented May 14, 2025

we should keep use utils.Merge everywhere if possible.

@zirain zirain requested a review from a team as a code owner May 14, 2025 23:12
@arkodg
Copy link
Contributor

arkodg commented May 14, 2025

thanks @zirain

@ryanhristovski can you suggest a test case to ensure there are no regressions

@zirain
Copy link
Member Author

zirain commented May 14, 2025

thanks @zirain

@ryanhristovski can you suggest a test case to ensure there are no regressions

IIUC, there're some cases in translator.

@codecov
Copy link

codecov bot commented May 14, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 70.41%. Comparing base (8097b95) to head (f677c92).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #6074   +/-   ##
=======================================
  Coverage   70.41%   70.41%           
=======================================
  Files         217      217           
  Lines       36171    36129   -42     
=======================================
- Hits        25468    25441   -27     
+ Misses       9182     9172   -10     
+ Partials     1521     1516    -5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Contributor

@arkodg arkodg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

@arkodg arkodg requested review from a team May 14, 2025 23:35
@zhaohuabing

This comment was marked as outdated.

zirain added 2 commits May 15, 2025 12:15
Signed-off-by: zirain <zirain2009@gmail.com>
Signed-off-by: zirain <zirain2009@gmail.com>
@zirain zirain force-pushed the use-one-merge-func branch from 1d0c8c0 to f677c92 Compare May 15, 2025 04:15
@zirain zirain merged commit 3e1bce3 into envoyproxy:main May 15, 2025
27 checks passed
@zirain zirain deleted the use-one-merge-func branch May 15, 2025 05:55
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.

3 participants