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.

Sign up for GitHub

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

Jump to bottom

chore(deps): downgrade go-control-plane to v0.11.2-0.20231010133108-1dfbe83bcebc (backport of #9163) #9283

Closed
wants to merge 1 commit into from
Closed

chore(deps): downgrade go-control-plane to v0.11.2-0.20231010133108-1dfbe83bcebc (backport of #9163) #9283

wants to merge 1 commit into from

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Feb 15, 2024

Automatic cherry-pick of #9163 for branch release-2.4

Generated by action

cherry-picked commit 5299ab6
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.4
Your branch is up to date with 'origin/release-2.4'.

You are currently cherry-picking commit 5299ab681.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   pkg/xds/envoy/imports.go

no changes added to commit (use "git add" and/or "git commit -a")

@lobkovilya @kumahq
chore(deps): downgrade go-control-plane to v0.11.2-0.20231010133108-1…
7b8ff69 
…dfbe83bcebc (#9163)

* chore(deps): downgrade go-control-plane to avoid test flakes due to deadlocks

Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@kumahq kumahq bot requested a review from a team as a code owner February 15, 2024 17:13
@kumahq kumahq bot requested review from Automaat, lobkovilya and lukidzi and removed request for a team February 15, 2024 17:13
@lobkovilya lobkovilya closed this Feb 15, 2024
@lobkovilya lobkovilya deleted the chore/backport-release-2.4-9163 branch February 15, 2024 18:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Automaat Automaat Awaiting requested review from Automaat Automaat is a code owner automatically assigned from kumahq/kuma-maintainers

@lobkovilya lobkovilya Awaiting requested review from lobkovilya lobkovilya is a code owner automatically assigned from kumahq/kuma-maintainers

@lukidzi lukidzi Awaiting requested review from lukidzi lukidzi is a code owner automatically assigned from kumahq/kuma-maintainers

Assignees
No one assigned
Labels
conflict release-2.4
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@lobkovilya