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

fix(kuma-cp): set error when KDS clients fails in goroutine (backport of #7725) #7831

Merged
merged 3 commits into from
Sep 25, 2023

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Sep 25, 2023

Automatic cherry-pick of #7725 for branch release-2.0

Generated by action

cherry-picked commit 71eeaf0
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

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

You are currently cherry-picking commit 71eeaf0cb.
  (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:   pkg/kds/global/components.go
	modified:   pkg/kds/mux/session.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/kds/mux/client.go
	both modified:   pkg/kds/mux/server.go
	both modified:   pkg/kds/zone/components.go

@lukidzi lukidzi merged commit 7f15403 into release-2.0 Sep 25, 2023
@lukidzi lukidzi deleted the chore/backport-release-2.0-7725 branch September 25, 2023 09:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant