Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug: Fix merge race #2628

Merged
merged 1 commit into from
Feb 16, 2024
Merged

bug: Fix merge race #2628

merged 1 commit into from
Feb 16, 2024

Conversation

arkodg
Copy link
Contributor

@arkodg arkodg commented Feb 16, 2024

Between #2566

&

#2585

Between envoyproxy#2566

&

envoyproxy#2585

Signed-off-by: Arko Dasgupta <[email protected]>
@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
Copy link

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
17 checks passed
@arkodg arkodg deleted the mo-merge-races branch February 16, 2024 15:22
vixns pushed a commit to vixns/gateway that referenced this pull request Feb 18, 2024
Fix merge race

Between envoyproxy#2566

&

envoyproxy#2585

Signed-off-by: Arko Dasgupta <[email protected]>
Signed-off-by: Stéphane Cottin <[email protected]>
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