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

feat: script to disable bbr (backport #4047) #4048

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 22, 2024

Overview

adds a script to disable bbr as a convenience for anyone that needs to test w/ and w/o bbr


This is an automatic backport of pull request #4047 done by [Mergify](https://mergify.com).

## Overview

adds a script to disable bbr as a convenience for anyone that needs to
test w/ and w/o bbr

(cherry picked from commit e90d616)

# Conflicts:
#	Makefile
Copy link
Contributor Author

mergify bot commented Nov 22, 2024

Cherry-pick of e90d616 has failed:

On branch mergify/bp/v2.x/pr-4047
Your branch is up to date with 'origin/v2.x'.

You are currently cherry-picking commit e90d616f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   go.mod
	modified:   go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Makefile

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from a team as a code owner November 22, 2024 16:07
@mergify mergify bot added the conflicts label Nov 22, 2024
@mergify mergify bot requested review from staheri14 and evan-forbes November 22, 2024 16:07
@github-actions github-actions bot added the bot item was created by a bot label Nov 22, 2024
@rootulp rootulp marked this pull request as draft November 22, 2024 17:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant