Skip to content

bug: Fix merge race#2628

Merged
arkodg merged 1 commit intoenvoyproxy:mainfrom
arkodg:mo-merge-races
Feb 16, 2024
Merged

bug: Fix merge race#2628
arkodg merged 1 commit intoenvoyproxy:mainfrom
arkodg:mo-merge-races

Conversation

@arkodg
Copy link
Copy Markdown
Contributor

@arkodg arkodg commented Feb 16, 2024

Between #2566

&

#2585

Between envoyproxy#2566

&

envoyproxy#2585

Signed-off-by: Arko Dasgupta <arko@tetrate.io>
@arkodg arkodg requested a review from a team as a code owner February 16, 2024 02:21
@arkodg arkodg requested a review from a team February 16, 2024 02:21
@arkodg arkodg changed the title Fix merge race bug: Fix merge race Feb 16, 2024
@codecov
Copy link
Copy Markdown

codecov bot commented Feb 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (b2bfdbf) 63.44% compared to head (913703f) 63.54%.
Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2628      +/-   ##
==========================================
+ Coverage   63.44%   63.54%   +0.09%     
==========================================
  Files         119      119              
  Lines       19198    19236      +38     
==========================================
+ Hits        12180    12223      +43     
+ Misses       6202     6198       -4     
+ Partials      816      815       -1     

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

@arkodg arkodg requested a review from a team February 16, 2024 02:35
@arkodg arkodg enabled auto-merge (squash) February 16, 2024 02:49
@arkodg arkodg merged commit cc88e9c into envoyproxy:main Feb 16, 2024
@arkodg arkodg deleted the mo-merge-races branch February 16, 2024 15:22
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